Fixes to Yml matrix