* removed psobject to hashtables that were missed * fix up win_region change (cherry picked from commit 5e20fd0943)
5e20fd0943