Calendar hotfixes 330