Fixes for grid-based map