More date fixes