Fix (2) build matrix