Mods for getting rid of warnings when using -Wall compiler option