Clean up some bugs related to markers drawn on the map