Fixed map related crashes