diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs
index 4bd1f5d103..ac38ad047e 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/CompletionDataHelper.cs
@@ -89,7 +89,7 @@ namespace ICSharpCode.VBNetBinding
 			IClass c = GetCurrentClass(editor);
 			IMember m = GetCurrentMember(editor);
 			
-			HandleKeyword(ref result, info, resolvedType, word, c, m, editor, pressedKey);
+			HandleKeyword(ref result,  resolvedType, word, c, m, editor, pressedKey);
 			
 			AddSpecialItems(ref result, info, resolvedType, word, m, expressionResult, editor);
 			
@@ -106,7 +106,7 @@ namespace ICSharpCode.VBNetBinding
 			return result;
 		}
 
-		static void HandleKeyword(ref VBNetCompletionItemList result, ParseInformation info, IReturnType resolvedType, string word, IClass c, IMember m, ITextEditor editor, char pressedKey)
+		static void HandleKeyword(ref VBNetCompletionItemList result, IReturnType resolvedType, string word, IClass c, IMember m, ITextEditor editor, char pressedKey)
 		{
 			if (pressedKey == ' ') {
 				if (word.Equals("return", StringComparison.InvariantCultureIgnoreCase) && m != null) {
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
index b247c07b64..6607e861a2 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
@@ -176,7 +176,7 @@ namespace ICSharpCode.VBNetBinding
 		
 		bool? GetValue(string name, bool defaultVal)
 		{
-			string val = GetEvaluatedProperty("OptionInfer");
+			string val = GetEvaluatedProperty(name);
 			
 			if (val == null)
 				return defaultVal;
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetBracketSearcher.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetBracketSearcher.cs
index 08eef4551f..d6319c27f9 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetBracketSearcher.cs
+++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetBracketSearcher.cs
@@ -138,14 +138,14 @@ namespace ICSharpCode.VBNetBinding
 		#endregion
 		
 		#region statement search
-		int FindBeginStatementAroundOffset(IDocument document, int offset, out VBStatement statement, out int length)
+		static int FindBeginStatementAroundOffset(IDocument document, int offset, out VBStatement statement, out int length)
 		{
 			length = 0;
 			statement = null;
 			return -1;
 		}
 		
-		int FindEndStatementAroundOffset(IDocument document, int offset, out VBStatement statement)
+		static int FindEndStatementAroundOffset(IDocument document, int offset, out VBStatement statement)
 		{
 			IDocumentLine line = document.GetLineForOffset(offset);
 			
@@ -168,7 +168,7 @@ namespace ICSharpCode.VBNetBinding
 			return -1;
 		}
 		
-		int FindBeginStatement(IDocument document, VBStatement statement, Location endLocation, out int length)
+		static int FindBeginStatement(IDocument document, VBStatement statement, Location endLocation, out int length)
 		{
 			ILexer lexer = ParserFactory.CreateLexer(SupportedLanguage.VBNet, document.CreateReader());
 			
@@ -226,13 +226,13 @@ namespace ICSharpCode.VBNetBinding
 			return -1;
 		}
 		
-		int FindEndStatement(IDocument document, VBStatement statement)
+		static int FindEndStatement(IDocument document, VBStatement statement)
 		{
 			return -1;
 		}
 		#endregion
 		
-		bool IsDeclaration(int kind)
+		static bool IsDeclaration(int kind)
 		{
 			return kind == Tokens.Sub || kind == Tokens.Function || kind == Tokens.Operator || VBNetFormattingStrategy.IsDeclaration(kind);
 		}
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Snippets/SnippetSelectionElement.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Snippets/SnippetSelectionElement.cs
index 6f4181597e..8f81b78a08 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Snippets/SnippetSelectionElement.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Snippets/SnippetSelectionElement.cs
@@ -18,6 +18,9 @@ namespace ICSharpCode.AvalonEdit.Snippets
 	[Serializable]
 	public class SnippetSelectionElement : SnippetElement
 	{
+		/// <summary>
+		/// Gets/Sets the new indentation of the selected text.
+		/// </summary>
 		public int Indentation { get; set; }
 		
 		/// <inheritdoc/>