YAML fixes for CI