Merge "Fix some errors in errorCalculator.rs."