Fix data problems