[mr2626] Calendar: small improvements