Updates, in particular to fix a bug with fbgraph