Social friends fixes