Fixed some calendar stuff