Some issues fixed in delegates