Some improvements to Facebook SDK 3.0 integration

Some improvements based on the code review.