Fixes for box grids