diff --git a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
index 59a02c6fc..aeee45d43 100644
--- a/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+++ b/ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // CSharpCompletionEngine.cs
 //  
 // Author:
@@ -288,7 +288,6 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
 
 		IEnumerable<ICompletionData> MagicKeyCompletion(char completionChar, bool controlSpace)
 		{
-			ExpressionResult expr;
 			Tuple<ResolveResult, CSharpResolver> resolveResult;
 			switch (completionChar) {
 			// Magic key completion
diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
index f15a8381b..26c93a9da 100644
--- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
+++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
@@ -41,7 +41,8 @@
     <DefineConstants>TRACE;FULL_AST</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
+    <DebugType>PdbOnly</DebugType>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
index afc95aec2..dc9d0d41b 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/InconsistentNamingIssue.cs
@@ -1,4 +1,4 @@
-// 
+// 
 // InconsistentNamingIssue.cs
 //  
 // Author:
@@ -48,7 +48,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		{
 			readonly InconsistentNamingIssue inspector;
 			readonly NamingConventionService service;
-			List<NamingRule> rules;
 
 			public GatherVisitor (BaseRefactoringContext ctx, InconsistentNamingIssue inspector) : base (ctx)
 			{
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
index b9cfaef00..caf62c78f 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/Script.cs
@@ -324,7 +324,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 		/// <summary>
 		/// Renames the specified entity.
 		/// </summary>
-		/// <param name='entity'>
+		/// <param name='type'>
 		/// The Entity to rename
 		/// </param>
 		/// <param name='name'>
diff --git a/ICSharpCode.NRefactory/Editor/IDocument.cs b/ICSharpCode.NRefactory/Editor/IDocument.cs
index ade9ea808..4201ce448 100644
--- a/ICSharpCode.NRefactory/Editor/IDocument.cs
+++ b/ICSharpCode.NRefactory/Editor/IDocument.cs
@@ -35,7 +35,7 @@ namespace ICSharpCode.NRefactory.Editor
 		/// <summary>
 		/// Gets/Sets the text of the whole document..
 		/// </summary>
-		new string Text { get; set; } // hides TextBuffer.Text to add the setter
+		new string Text { get; set; } // hides ITextSource.Text to add the setter
 		
 		/// <summary>
 		/// This event is called directly before a change is applied to the document.
diff --git a/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs b/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
index d5d3b0dfb..f2381b878 100644
--- a/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
+++ b/ICSharpCode.NRefactory/Properties/GlobalAssemblyInfo.cs
@@ -17,10 +17,10 @@ using System.Runtime.InteropServices;
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
 [assembly: ComVisible(false)]
 
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all the values or you can use the default the Revision and 
-// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("5.0.0.6")]
+// We keep the AssemblyVersion at 5.0.0.0 for all versions of NRefactory 5.
+// This eliminates the need for binding redirects.
+[assembly: AssemblyVersion("5.0.0.0")]
+
+// [AssemblyFileVersion] is the version of the NuGet package,
+// should follow http://semver.org/ rules
+[assembly: AssemblyFileVersion("5.0.1")]
diff --git a/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs b/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
index 7a946fd5c..a0a59c356 100644
--- a/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
+++ b/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
@@ -410,16 +410,14 @@ namespace ICSharpCode.NRefactory.TypeSystem
 		#region ITypeReference.Resolve(ICompilation)
 
 		/// <summary>
-		/// Resolves a type reference.
+		/// Resolves a type reference in the compilation's main type resolve context.
+		/// Some type references require a more specific type resolve context and will not resolve using this method.
 		/// </summary>
 		/// <returns>
 		/// Returns the resolved type.
 		/// In case of an error, returns <see cref="SpecialType.UnknownType"/>.
 		/// Never returns null.
 		/// </returns>
-		/// <param name='compilation'>
-		/// The compilation in which the type should be resolved.
-		/// </param>
 		public static IType Resolve (this ITypeReference reference, ICompilation compilation)
 		{
 			if (reference == null)
diff --git a/Packages/ICSharpCode.NRefactory.nuspec b/Packages/ICSharpCode.NRefactory.nuspec
index 7ffda799b..770e9c009 100644
--- a/Packages/ICSharpCode.NRefactory.nuspec
+++ b/Packages/ICSharpCode.NRefactory.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>ICSharpCode.NRefactory</id>
-    <version>5.0.0.6</version>
+    <version>5.0.1</version>
     <title>NRefactory</title>
     <authors>Daniel Grunwald, Mike Krüger</authors>
     <owners>Daniel Grunwald</owners>
@@ -11,7 +11,7 @@
     <iconUrl>http://community.sharpdevelop.net/blogs/mattward/SharpDevelop.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>NRefactory supports analysis of C# source code: it includes a parser, abstract syntax tree, type system, semantic analysis (resolver), code completion, and several refactorings.</description>
-    <releaseNotes>This is an alpha release. Expect bugs and breaking changes in the future.</releaseNotes>
+    <!--<releaseNotes></releaseNotes>-->
     <copyright>Copyright 2010-2012 AlphaSierraPapa</copyright>
     <tags>C# Parser Semantic Analysis SharpDevelop</tags>
     <dependencies>