Fixes for calendar