more fixes to calendar stuff