More improvements to build matrix