More consistent dates. Closes #290