fixes for new map