Fix yaml support