Upcoming tile fixes