Fix bug with HolidayManager and some cleanup