Calendar update fixes