Tile collision fixes, including 2.5D