Correcting few bugs