More fixes for tiling