some fixes for grid