Fix TileLayer issues