yaml fixes
more fixes