More calendar tweaks