Fix delegator bugs