Fix yaml handling