Performance / tiles fixes