Chef followup work

A couple of changes in support of Chef.