Facebook integration fixes