Map fixes by @pitis91