Ben/calendar fixes