Fixed some issues with Calendar