Fix some yaml issues