Social extension fixes