Fixes to Events Calendar