2.0 delegate leaks

I noticed that you committed a fix for this, but I had a couple additional things in my fork that I would share.