Fix data parsing issues