Fix matrix excludes (again) (hopefully)