grid and tiles fixes