several date fixes