Fixup compiler warnings,