Calendar fixes.