Still more fixes to the libgridgen build