More fixes from various Delegates.