Datetime format fixes