more fixes
Merge pull request #2109 from tysonn/updatingmanagers

more fixes