diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
index 761adf4791..2de7fddf69 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/SelectReferenceDialog.cs
@@ -244,6 +244,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			this.gacTabPage.Size = new System.Drawing.Size(464, 198);
 			this.gacTabPage.TabIndex = 0;
 			this.gacTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.GacTabPage");
+			this.gacTabPage.UseVisualStyleBackColor = true;
 			// 
 			// projectTabPage
 			// 
@@ -251,6 +252,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 			this.projectTabPage.Size = new System.Drawing.Size(464, 198);
 			this.projectTabPage.TabIndex = 1;
 			this.projectTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.ProjectTabPage");
+			this.projectTabPage.UseVisualStyleBackColor = true;
 			// 
 			// browserTabPage
 			// 
@@ -258,11 +260,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 			this.browserTabPage.Size = new System.Drawing.Size(464, 198);
 			this.browserTabPage.TabIndex = 2;
 			this.browserTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.BrowserTabPage");
+			this.browserTabPage.UseVisualStyleBackColor = true;
 			
 			this.comTabPage.Location = new System.Drawing.Point(4, 22);
 			this.comTabPage.Size = new System.Drawing.Size(464, 198);
 			this.comTabPage.TabIndex = 2;
 			this.comTabPage.Text = "COM";
+			this.comTabPage.UseVisualStyleBackColor = true;
 			
 			//
 			// referencesLabel
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/CodeGenerator.cs b/src/Main/Base/Project/Src/Services/RefactoringService/CodeGenerator.cs
index 3041dcae4c..f7be6c23c9 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/CodeGenerator.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/CodeGenerator.cs
@@ -36,7 +36,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 			while (returnType.ArrayDimensions > 0) {
 				int[] rank = typeRef.RankSpecifier ?? new int[0];
 				Array.Resize(ref rank, rank.Length + 1);
-				rank[rank.Length - 1] = returnType.ArrayDimensions;
+				rank[rank.Length - 1] = returnType.ArrayDimensions - 1;
 				typeRef.RankSpecifier = rank;
 				returnType = returnType.ArrayElementType;
 			}