Fixed some issues with calendar