Small fixes in dataengine