Fixed mis-translation issues found by testsuite