diff --git a/uppsrc/DropGrid/DropGrid.cpp b/uppsrc/DropGrid/DropGrid.cpp
index 763c886be..cfe3a6322 100644
--- a/uppsrc/DropGrid/DropGrid.cpp
+++ b/uppsrc/DropGrid/DropGrid.cpp
@@ -194,7 +194,6 @@ void DropGrid::Paint(Draw& w)
 	else
 		clear.Hide();
 	
-	GridDisplay &disp = display ? *display : list.GetDisplay();
 	bool hf = HasFocus();
 	bool isnull = rowid < 0;
 	Color fg = hf ? SColorHighlightText() : IsEnabled() ? SColorText() : SColorDisabled();
diff --git a/uppsrc/GridCtrl/GridCtrl.cpp b/uppsrc/GridCtrl/GridCtrl.cpp
index cb449caf5..e5dd1cafb 100644
--- a/uppsrc/GridCtrl/GridCtrl.cpp
+++ b/uppsrc/GridCtrl/GridCtrl.cpp
@@ -1091,8 +1091,10 @@ GridCtrl::Item& GridCtrl::GetItemSize(int &r, int &c, int &x, int &y, int &cx, i
 		if(skip)
 			return *it;
 
-		while(c >= 0 && items[idy][hitems[c].id].group == group) --c; ++c;
-		while(r >= 0 && items[vitems[r].id][idx].group == group) --r; ++r;
+		while(c >= 0 && items[idy][hitems[c].id].group == group) --c;
+		++c;
+		while(r >= 0 && items[vitems[r].id][idx].group == group) --r;
+		++r;
 
 		dx = it->cx;
 		dy = it->cy;
@@ -2622,12 +2624,14 @@ Rect GridCtrl::GetItemRect(int r, int c, bool hgrid, bool vgrid, bool hrel, bool
 	{
 		int group = it.group;
 
-		while(r > fixed_rows && items[vitems[r].id][idx].group == group) --r; ++r;
+		while(r > fixed_rows && items[vitems[r].id][idx].group == group) --r;
+		++r;
 
 		top = vitems[r].nTop(dy);
 		bottom = vitems[r + it.cy].nBottom(dy);
 
-		while(c > fixed_cols && items[idy][hitems[c].id].group == group) --c; ++c;
+		while(c > fixed_cols && items[idy][hitems[c].id].group == group) --c;
+		++c;
 
 		left = hitems[c].nLeft(dx);
 		right = hitems[c + it.cx].nRight(dx);
@@ -4404,9 +4408,11 @@ void GridCtrl::RefreshRow(int n, bool relative, bool fixed)
 	if(join > 0)
 	{
 		int s = n;
-		while(s >= 0 && vitems[s].join > 0) s--; s++;
+		while(s >= 0 && vitems[s].join > 0) s--;
+		s++;
 		int e = n;
-		while(e < total_rows && vitems[e].join > 0) e++; e--;
+		while(e < total_rows && vitems[e].join > 0) e++;
+		e--;
 		Refresh(Rect(0, vitems[s].nTop(dy), GetSize().cx, vitems[e].nBottom(dy)));
 	}
 	else