Bugs resolved