Added some additional Facebook handling