Bug fixes in dataDealer