Fixed a couple of bugs with Calendar.