diff --git a/NCDK/NCDK.csproj b/NCDK/NCDK.csproj
index db5eb99a..6673da29 100644
--- a/NCDK/NCDK.csproj
+++ b/NCDK/NCDK.csproj
@@ -42,13 +42,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Analysis|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Analysis\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <NoWarn>0164,0612,0618,0672,3021</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotNetRDF, Version=1.0.12.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
diff --git a/NCDKDisplay/NCDKDisplay.csproj b/NCDKDisplay/NCDKDisplay.csproj
index aef5849c..ffc0916a 100644
--- a/NCDKDisplay/NCDKDisplay.csproj
+++ b/NCDKDisplay/NCDKDisplay.csproj
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;0612,0618,0162,0164</DefineConstants>
+    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\NCDKDisplay.xml</DocumentationFile>