Minor changes while reworking tile