Minor changes to try to get UserFriendship actions to work.