date time fields fixes