calendar hotfixes