Major: fixed date problems