Little bugfixes for the Delegate class.