Bugs and interface changes