Added fixes for the facebook stuff