Set up a proper peer method
Land #3523, release fixes

I didn't misspell it this time. :)