fixes for more relyable map loading