More calendar fixes