Minor changes to flaP and grdP layer code