Fixed some bugs related to the new manager replacements