Added FB workarounds again