Friends fixes

Here are a couple of fixes to the reset sequence for friends.
(along with a couple misc fixes which I happened to notice)