Icehouse yaml fixes