- minor changes for puppet_apply