Small changes on delegation