Fix (5) build matrix