Fix a few working set related issues

Replace #9134

Fixes #9019 
Fixes #8973
Fixes #9032

@redmunds