Fixing the build and more issues related to gfac