more date fixes