Fixed issues with delegate methods.