School holidays modifications/fixes