More fixes to FB