Calendar and other fixes