[gfs] Various fixes, for paper