Implemented manager specific bug fixes