Fixes for data disparity