2.06.3:zeress:121 Various Map fixes