More fixes to data size