More calendar changes/fixes