Fixes to improve accuracy of data