Completion of missed YAML updates

The YAML merge missed a number of updates. Whoops!