More minor fixes without map merger bleh