Fixing matrix build