Cleanup some warnings in the maploader