diff --git a/LibGit2Sharp/ContentChanges.cs b/LibGit2Sharp/ContentChanges.cs
index 01fb41751..e5d84503e 100644
--- a/LibGit2Sharp/ContentChanges.cs
+++ b/LibGit2Sharp/ContentChanges.cs
@@ -13,7 +13,6 @@ namespace LibGit2Sharp
     public class ContentChanges
     {
         private readonly StringBuilder patchBuilder = new StringBuilder();
-        private bool isBinaryComparison;
 
         /// <summary>
         /// Needed for mocking purposes.
@@ -31,7 +30,7 @@ internal ContentChanges(Repository repo, Blob oldBlob, Blob newBlob, GitDiffOpti
 
         internal ContentChanges(bool isBinaryComparison)
         {
-            this.isBinaryComparison = isBinaryComparison;
+            this.IsBinaryComparison = isBinaryComparison;
         }
 
         internal void AppendToPatch(string patch)
@@ -60,11 +59,7 @@ public virtual string Patch
         /// <summary>
         /// Determines if at least one side of the comparison holds binary content.
         /// </summary>
-        public virtual bool IsBinaryComparison
-        {
-            get { return isBinaryComparison; }
-            private set { isBinaryComparison = value; }
-        }
+        public virtual bool IsBinaryComparison { get; private set; }
 
         private int FileCallback(GitDiffDelta delta, float progress, IntPtr payload)
         {
diff --git a/LibGit2Sharp/NoteCollection.cs b/LibGit2Sharp/NoteCollection.cs
index 0caa38789..678ffdeac 100644
--- a/LibGit2Sharp/NoteCollection.cs
+++ b/LibGit2Sharp/NoteCollection.cs
@@ -75,11 +75,9 @@ internal IEnumerable<string> NamespaceRefs
         {
             get
             {
-                return new[] { NormalizeToCanonicalName(DefaultNamespace) }.Concat(
-                   from reference in repo.Refs
-                   select reference.CanonicalName into refCanonical
-                   where refCanonical.StartsWith(Reference.NotePrefix, StringComparison.Ordinal) && refCanonical != NormalizeToCanonicalName(DefaultNamespace)
-                   select refCanonical);
+                return new[] { NormalizeToCanonicalName(DefaultNamespace) }.Concat(repo.Refs
+                    .Select(reference => reference.CanonicalName)
+                    .Where(refCanonical => refCanonical.StartsWith(Reference.NotePrefix, StringComparison.Ordinal) && refCanonical != NormalizeToCanonicalName(DefaultNamespace)));
             }
         }
 
@@ -155,7 +153,7 @@ internal static string NormalizeToCanonicalName(string name)
             return string.Concat(Reference.NotePrefix, name);
         }
 
-        internal string UnCanonicalizeName(string name)
+        internal static string UnCanonicalizeName(string name)
         {
             Ensure.ArgumentNotNullOrEmptyString(name, "name");