Fixing bugs, part 2