Yet More Tilemap Fixes