I've been messing with the calendar in HEAD for another project and I could fixup what's broken this weekend. I'm sure I can get the postgres stuff working but it might take longer for Oracle. I might roll what I've been working on into it if that does not bother anyone.