Accuracy fixes