Fix the build matrix