More fixes to data path