Updates towards working GFS version.