More yaml fixes