fixes to eo calendar