Grid mode fixes.