Fix data fields