More fixes for calendars. WOOOHOO! No more calendars for bugs either!