Testing revealed bugs, fixed