Coruse Calendar fixes