Changes to managers so that unit tests pass again