Build matrix enhancements

See commits