A few bugs resolved