Some tweaks
Merge friends with remote friends