Delegation Fixes and Improvements