Fix data path issues