Map bug fixes
Minor fixes