Improved build matrix.