Monday morning Management Libraries fixes