Consistently format dates, fixes #1