Some bugs resolved