Correcting more bugs