diff --git a/src/Microsoft.AspNet.OData.Shared/Common/SRResources.Designer.cs b/src/Microsoft.AspNet.OData.Shared/Common/SRResources.Designer.cs
index 5d350ccf7c..6596fd4e34 100644
--- a/src/Microsoft.AspNet.OData.Shared/Common/SRResources.Designer.cs
+++ b/src/Microsoft.AspNet.OData.Shared/Common/SRResources.Designer.cs
@@ -2280,6 +2280,17 @@ internal static string Object_NotYetInitialized
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Object to delete not found..
+        /// </summary>
+        internal static string ObjectToDeleteNotFound
+        {
+            get
+            {
+                return ResourceManager.GetString("ObjectToDeleteNotFound", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Unknown function &apos;{0}&apos;..
         /// </summary>
diff --git a/src/Microsoft.AspNet.OData.Shared/Common/SRResources.resx b/src/Microsoft.AspNet.OData.Shared/Common/SRResources.resx
index f94864ec2e..93ed987ced 100644
--- a/src/Microsoft.AspNet.OData.Shared/Common/SRResources.resx
+++ b/src/Microsoft.AspNet.OData.Shared/Common/SRResources.resx
@@ -1006,4 +1006,7 @@
   <data name="DeltaLinkNotSupported" xml:space="preserve">
     <value>DeltaLinks are not supported</value>
   </data>
+  <data name="ObjectToDeleteNotFound" xml:space="preserve">
+    <value>Object to delete not found.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.OData.Shared/DeltaOfTStructuralType.cs b/src/Microsoft.AspNet.OData.Shared/DeltaOfTStructuralType.cs
index f60e4ec76b..c2433d939c 100644
--- a/src/Microsoft.AspNet.OData.Shared/DeltaOfTStructuralType.cs
+++ b/src/Microsoft.AspNet.OData.Shared/DeltaOfTStructuralType.cs
@@ -868,6 +868,7 @@ private void CopyChangedDynamicValues(TStructuralType targetEntity)
         /// <param name="original">The structural object</param>
         /// <param name="apiHandler">API Handler for the entity.</param>
         /// <param name="apiHandlerFactory">API Handler Factory</param>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         private void CopyChangedNestedProperties(TStructuralType original, ODataAPIHandler<TStructuralType> apiHandler = null, ODataAPIHandlerFactory apiHandlerFactory = null)
         {
             // For nested resources.
diff --git a/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs b/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
index 4a095c53da..b0b410e29b 100644
--- a/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
+++ b/src/Microsoft.AspNet.OData.Shared/DeltaSetOfT.cs
@@ -226,7 +226,7 @@ internal DeltaSet<TStructuralType> CopyChangedValues(IODataAPIHandler apiHandler
                             // Handle Failed Operation - Delete when the object doesn't exist.
                             IDeltaSetItem deltaSetItem = changedObj;
                             DataModificationExceptionType dataModificationExceptionType = new DataModificationExceptionType(operation);
-                            dataModificationExceptionType.MessageType = new MessageType { Message = "Object to delete not found." };
+                            dataModificationExceptionType.MessageType = new MessageType { Message = SRResources.ObjectToDeleteNotFound };
 
                             deltaSetItem.TransientInstanceAnnotationContainer.AddResourceAnnotation(SRResources.DataModificationException, dataModificationExceptionType);
                             deltaSet.Add(deltaSetItem);
diff --git a/src/Microsoft.AspNet.OData.Shared/IODataAPIHandler.cs b/src/Microsoft.AspNet.OData.Shared/IODataAPIHandler.cs
index 2ef3a76597..1139f8f251 100644
--- a/src/Microsoft.AspNet.OData.Shared/IODataAPIHandler.cs
+++ b/src/Microsoft.AspNet.OData.Shared/IODataAPIHandler.cs
@@ -14,6 +14,7 @@ namespace Microsoft.AspNet.OData
     /// This is being implemented by ODataAPIHandler{TStructuralType} which has a method returning nested ODataApiHandler.
     /// A generic empty interface is needed since the nested patch handler will be of different type.
     /// </remarks>
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1040:AvoidEmptyInterfaces")]
     public interface IODataAPIHandler
     {
 
diff --git a/src/Microsoft.AspNet.OData.Shared/ODataAPIHandler.cs b/src/Microsoft.AspNet.OData.Shared/ODataAPIHandler.cs
index 41cf609fc0..4ab8a0ec48 100644
--- a/src/Microsoft.AspNet.OData.Shared/ODataAPIHandler.cs
+++ b/src/Microsoft.AspNet.OData.Shared/ODataAPIHandler.cs
@@ -39,6 +39,8 @@ public abstract class ODataAPIHandler<TStructuralType>: IODataAPIHandler where T
         /// <param name="originalObject">Object to return.</param>
         /// <param name="errorMessage">Any error message in case of an exception.</param>
         /// <returns>The status of the TryGet method <see cref="ODataAPIResponseStatus"/>.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", MessageId = "2#")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", MessageId = "1#")]
         public abstract ODataAPIResponseStatus TryGet(IDictionary<string, object> keyValues, out TStructuralType originalObject, out string errorMessage);
 
         /// <summary>
@@ -47,6 +49,7 @@ public abstract class ODataAPIHandler<TStructuralType>: IODataAPIHandler where T
         /// <param name="keyValues">Key-value pair for the entity keys.</param>
         /// <param name="errorMessage">Any error message in case of an exception.</param>
         /// <returns>The status of the TryGet method <see cref="ODataAPIResponseStatus"/>.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", MessageId = "1#")]
         public abstract ODataAPIResponseStatus TryDelete(IDictionary<string, object> keyValues, out string errorMessage);
 
         /// <summary>
@@ -55,6 +58,7 @@ public abstract class ODataAPIHandler<TStructuralType>: IODataAPIHandler where T
         /// <param name="resource">The object to be added.</param>
         /// <param name="errorMessage">Any error message in case of an exception.</param>
         /// <returns>The status of the AddRelatedObject method <see cref="ODataAPIResponseStatus"/>.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters", MessageId = "1#")]
         public abstract ODataAPIResponseStatus TryAddRelatedObject(TStructuralType resource, out string errorMessage);
 
         /// <summary>
@@ -84,7 +88,7 @@ internal virtual void UpdateLinkedObjects(TStructuralType resource, IEdmModel mo
             }
         }
 
-        private ODataPath GetODataPath(string path, IEdmModel model)
+        private static ODataPath GetODataPath(string path, IEdmModel model)
         {
             ODataUriParser parser = new ODataUriParser(model, new Uri(path, UriKind.Relative));
             ODataPath odataPath = parser.ParsePath();
diff --git a/src/Microsoft.AspNet.OData.Shared/ODataAPIHandlerFactory.cs b/src/Microsoft.AspNet.OData.Shared/ODataAPIHandlerFactory.cs
index 4c0a69fb0f..02fbe53286 100644
--- a/src/Microsoft.AspNet.OData.Shared/ODataAPIHandlerFactory.cs
+++ b/src/Microsoft.AspNet.OData.Shared/ODataAPIHandlerFactory.cs
@@ -35,6 +35,7 @@ protected ODataAPIHandlerFactory(IEdmModel model)
         /// </summary>
         /// <param name="odataPath">OData path corresponding to an @odata.id.</param>
         /// <returns>ODataAPIHandler for the specified OData path.</returns>
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "1#")]
         public abstract IODataAPIHandler GetHandler(ODataPath odataPath);
 
         /// <summary>