More fixes for accuracy of data