Monday morning Management Libraries fixes
Merge pull request #1976 from jeffwilcox/dev-monday-morning-fixes

Monday morning Management Libraries fixes