Improved the build matrix.