Stage 2 builds.
Fix some testsuite errors...