Fixed a few issues with delegate methods