Adding build fixes to GReg