Slightly faster builds and test fixes.