diff --git a/templates/Alloy.Mvc/Business/ContentLocator.cs b/templates/Alloy.Mvc/Business/ContentLocator.cs
index 329f07d..30fe4fa 100644
--- a/templates/Alloy.Mvc/Business/ContentLocator.cs
+++ b/templates/Alloy.Mvc/Business/ContentLocator.cs
@@ -60,7 +60,7 @@ public IEnumerable<PageData> FindPagesByPageType(PageReference pageLink, bool re
     }
 
     // Type specified through page type ID
-    private IEnumerable<PageData> FindPagesByPageTypeRecursively(PageReference pageLink, int pageTypeId)
+    private PageDataCollection FindPagesByPageTypeRecursively(PageReference pageLink, int pageTypeId)
     {
         var criteria = new PropertyCriteriaCollection
         {
diff --git a/templates/Alloy.Mvc/Business/Rendering/AlloyContentAreaItemRenderer.cs b/templates/Alloy.Mvc/Business/Rendering/AlloyContentAreaItemRenderer.cs
index 54fd9ba..a9e201b 100644
--- a/templates/Alloy.Mvc/Business/Rendering/AlloyContentAreaItemRenderer.cs
+++ b/templates/Alloy.Mvc/Business/Rendering/AlloyContentAreaItemRenderer.cs
@@ -38,7 +38,7 @@ private static string GetCssClassForTag(string tagName)
 
     private static string GetTypeSpecificCssClasses(ContentAreaItem contentAreaItem)
     {
-        var content = contentAreaItem.GetContent();
+        var content = contentAreaItem.LoadContent();
         var cssClass = content == null ? string.Empty : content.GetOriginalType().Name.ToLowerInvariant();
 
         if (content is ICustomCssInContentArea customClassContent &&
diff --git a/templates/Alloy.Mvc/Components/ContactBlockViewComponent.cs b/templates/Alloy.Mvc/Components/ContactBlockViewComponent.cs
index 4f00f68..e511f23 100644
--- a/templates/Alloy.Mvc/Components/ContactBlockViewComponent.cs
+++ b/templates/Alloy.Mvc/Components/ContactBlockViewComponent.cs
@@ -51,7 +51,7 @@ protected override IViewComponentResult InvokeComponent(ContactBlock currentCont
         return View(model);
     }
 
-    private IHtmlContent GetLinkUrl(ContactBlock contactBlock)
+    private HtmlString GetLinkUrl(ContactBlock contactBlock)
     {
         if (contactBlock.LinkUrl != null && !contactBlock.LinkUrl.IsEmpty())
         {
diff --git a/templates/Alloy.Mvc/Components/PageListBlockViewComponent.cs b/templates/Alloy.Mvc/Components/PageListBlockViewComponent.cs
index 454088e..5d3471d 100644
--- a/templates/Alloy.Mvc/Components/PageListBlockViewComponent.cs
+++ b/templates/Alloy.Mvc/Components/PageListBlockViewComponent.cs
@@ -47,7 +47,7 @@ private IEnumerable<PageData> FindPages(PageListBlock currentBlock)
 
         if (currentBlock.Recursive)
         {
-            if (currentBlock.PageTypeFilter != null)
+            if (currentBlock.PageTypeFilter is not null)
             {
                 pages = _contentLocator.FindPagesByPageType(listRoot, true, currentBlock.PageTypeFilter.ID);
             }
@@ -58,7 +58,7 @@ private IEnumerable<PageData> FindPages(PageListBlock currentBlock)
         }
         else
         {
-            if (currentBlock.PageTypeFilter != null)
+            if (currentBlock.PageTypeFilter is not null)
             {
                 pages = _contentLoader
                     .GetChildren<PageData>(listRoot)
@@ -70,7 +70,7 @@ private IEnumerable<PageData> FindPages(PageListBlock currentBlock)
             }
         }
 
-        if (currentBlock.CategoryFilter != null && currentBlock.CategoryFilter.Any())
+        if (currentBlock.CategoryFilter is not null && !currentBlock.CategoryFilter.IsEmpty)
         {
             pages = pages.Where(x => x.Category.Intersect(currentBlock.CategoryFilter).Any());
         }
diff --git a/templates/EPiServer.Templates.csproj b/templates/EPiServer.Templates.csproj
index eacb05a..70e0da6 100644
--- a/templates/EPiServer.Templates.csproj
+++ b/templates/EPiServer.Templates.csproj
@@ -8,7 +8,9 @@
     <ContentTargetFolders>content</ContentTargetFolders>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <!-- Typical NuGet warning when packaging templates  -->
-    <NoWarn>$(NoWarn);NU5100;NU5110;NU5111;NU5123</NoWarn>
+    <!-- CA1707: Identifiers should not contain underscores -->
+    <!-- IDE0005: Using directive is unnecessary -->
+    <NoWarn>$(NoWarn);NU5100;NU5110;NU5111;NU5123;CA1707;IDE0005</NoWarn>
   </PropertyGroup>
 
   <!-- Package information -->