Fixes to allow tile changes