Fix bugs with 'find a friend' version.