Facebook bug fix and more clean up.