manager fixes and component borrowing adjustments