Added date fixes