Attempt to fix the build matrices