Fixes for grid toggle stuff.