More fixes for social