Yet more yml tweaks