[mr2592] Fixes for Calendar