Map: Minor fixes / Cleanup