fix some fb bugs