Fix all other calls to yaml