#1258 More tweaks to FriendResponse
#1282 Tweaks