buildgrid fixes