Fixes to Delegate