fix yaml etc