More corrections to try and get test suite to complete