fix a few working set related issues
Merge pull request #9160 from adobe/jeff/wsv-fixes-squashed

Fix a few working set related issues