Facebook Fixes

- Fixing some bugs