Fix managers, re-add deleted code