First pass calendar fixup.