Adds proper grid and rhgrid checks