Calendar fixes