Repair the fb-button bugs