Merge "Fix some errors in errorCalculator.rs." into nyc-dev