Minor updates to Grid2 and STUF.