Correcting obvious warnings