fixes for map