Accuracy improvements (cont.).