Calendaring tweaks