Calendar and content fixes