More Tilemap Fixes