Date fixes

Resolves #37