Fixes in delegate calling.