Fixes to yaml