backport from nanotrasenstation
map fixes