fixes to handle new years