diff --git a/Libraries/Hotcakes.Commerce.Dnn/Web/HotcakesModuleBase.cs b/Libraries/Hotcakes.Commerce.Dnn/Web/HotcakesModuleBase.cs
index c5bcbf0a..841a951a 100644
--- a/Libraries/Hotcakes.Commerce.Dnn/Web/HotcakesModuleBase.cs
+++ b/Libraries/Hotcakes.Commerce.Dnn/Web/HotcakesModuleBase.cs
@@ -51,7 +51,7 @@ private bool IsScriptResourcesAdded
         {
             get
             {
-                return Page.Items[IsScriptResourcesAddedKey] != null && (bool) Page.Items[IsScriptResourcesAddedKey];
+                return Page.Items[IsScriptResourcesAddedKey] != null && (bool)Page.Items[IsScriptResourcesAddedKey];
             }
             set { Page.Items[IsScriptResourcesAddedKey] = value; }
         }
@@ -151,42 +151,20 @@ protected void RegisterStyleSheet(string path)
 
         protected void RegisterViewScript(string path, int order = 0)
         {
-            if (!string.IsNullOrEmpty(path))
-            {
-                ClientResourceManager.RegisterScript(Page, ResolveUrl(HccApp.ViewsVirtualPath + "/Scripts/" + path),
-                    FileOrder.Js.DefaultPriority + 10 + order);
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            ClientResourceManager.RegisterScript(Page, ResolveUrl(HccApp.ViewsVirtualPath + "/Scripts/" + path),
+                FileOrder.Js.DefaultPriority + 10 + order);
         }
 
         protected void RegisterScript(string path, int order = 0)
         {
-            if (!string.IsNullOrEmpty(path))
-            {
-
                 ClientResourceManager.RegisterScript(Page, ResolveUrl(ScriptsBasePath + path),
                     FileOrder.Js.DefaultPriority + order);
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
         }
 
         protected void RegisterScriptExternal(string path, int order = 0)
         {
-            if (!string.IsNullOrEmpty(path))
-            {
                 ClientResourceManager.RegisterScript(Page, ResolveUrl(path),
                     FileOrder.Js.DefaultPriority + order);
-            }
-            else
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
         }
 
         protected void RegisterUnobtrusiveValidateScripts()
@@ -225,7 +203,7 @@ protected virtual void InitializeScriptManager()
                 }
 
                 var scriptResource = string.Format(" {1} var hcc = hcc || {{}}; hcc.l10n = {0};", json, analyticsScript);
-                ScriptManager.RegisterClientScriptBlock(this, typeof (HotcakesModuleBase), "ScriptResources",
+                ScriptManager.RegisterClientScriptBlock(this, typeof(HotcakesModuleBase), "ScriptResources",
                     scriptResource, true);
 
                 IsScriptResourcesAdded = true;
diff --git a/Libraries/Hotcakes.Payment/Hotcakes.Payment.csproj b/Libraries/Hotcakes.Payment/Hotcakes.Payment.csproj
index 9e511dbb..485c5d42 100644
--- a/Libraries/Hotcakes.Payment/Hotcakes.Payment.csproj
+++ b/Libraries/Hotcakes.Payment/Hotcakes.Payment.csproj
@@ -68,8 +68,8 @@
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\References\Dnn\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="paypal_base">
       <HintPath>..\..\References\Misc\paypal_base.dll</HintPath>
diff --git a/Libraries/Hotcakes.PaypalWebServices/Hotcakes.PaypalWebServices.csproj b/Libraries/Hotcakes.PaypalWebServices/Hotcakes.PaypalWebServices.csproj
index ee403543..a08aa80f 100644
--- a/Libraries/Hotcakes.PaypalWebServices/Hotcakes.PaypalWebServices.csproj
+++ b/Libraries/Hotcakes.PaypalWebServices/Hotcakes.PaypalWebServices.csproj
@@ -67,8 +67,9 @@
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\References\Dnn\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="PayPalCheckoutSdk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\PayPalCheckoutSdk.1.0.4\lib\netstandard2.0\PayPalCheckoutSdk.dll</HintPath>
     </Reference>
diff --git a/Website/DesktopModules/Hotcakes/Checkout/CheckoutView.ascx.cs b/Website/DesktopModules/Hotcakes/Checkout/CheckoutView.ascx.cs
index b6c4c9ad..95d2eebc 100644
--- a/Website/DesktopModules/Hotcakes/Checkout/CheckoutView.ascx.cs
+++ b/Website/DesktopModules/Hotcakes/Checkout/CheckoutView.ascx.cs
@@ -39,7 +39,7 @@ protected override string RenderView()
         {
             if (!string.IsNullOrEmpty(Request.QueryString["action"]))
             {
-                _action = Request.QueryString["action"];
+                _action = Request.QueryString["action"].ToLower();
             }
 
             if (_action == IndexAction || _action == PaymentErrorAction)