Fix date and time format