Fix date and time fields