Fixed some social network issues II