Mapfixes

@DonLakeFlyer @thomasgubler Fixes from mailing list. Tested.