Fix data problems
merge