Fixed map drawing bugs