Elaine: fix calendar date weirdness