Fixes to calendar