diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 525bff2999..b718edbf39 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -26,7 +26,8 @@ namespace Umbraco.Core.Configuration
     /// <summary>
     /// The GlobalSettings Class contains general settings information for the entire Umbraco instance based on information from  web.config appsettings 
     /// </summary>
-    internal class GlobalSettings
+    [Obsolete("TODO: Need to move this configuration class into the proper configuration accesors for v8!")]
+    public class GlobalSettings
     {
 
         #region Private static fields
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
index 5939e1abbd..22db3e58cf 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx
@@ -1,11 +1,12 @@
 <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %>
+<%@ Import Namespace="Umbraco.Core.Configuration" %>
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
     <script type="text/javascript">
         function toggleDiv(id) {
             var div = document.getElementById(id);
 
-            if (div.style.display == "none")
+            if (div.style.display === "none")
                 div.style.display = "block";
 
             else
@@ -13,7 +14,7 @@
         }
 
         function openDemo(link, id) {
-            UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550)
+            UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550);
         }
 
     </script>
@@ -159,7 +160,7 @@
                     //This is all a bit zany with double encoding because we have a URL in a hash (#) url part
                     // but it works and maintains query strings
 
-                    var umbPath = "<%=umbraco.GlobalSettings.Path%>";
+                    var umbPath = "<%=GlobalSettings.Path%>";
                     setTimeout(function () {
                         var mainWindow = UmbClientMgr.mainWindow();
 
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
index 05f2de9666..f452d7d0e4 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
@@ -2,6 +2,7 @@
     AutoEventWireup="True" Inherits="umbraco.presentation.developer.packages.Installer"
     Trace="false" ValidateRequest="false" %>
 <%@ Import Namespace="umbraco" %>
+<%@ Import Namespace="Umbraco.Core.Configuration" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
index e0559a3807..d8f0954331 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
+<%@ Page Language="C#" AutoEventWireup="true" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %>
 <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
 <asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index 93ed17e14d..6d91008f79 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -371,7 +371,7 @@
 												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
       </dependentAssembly>
 
       <dependentAssembly  xdt:Transform="Remove"
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index ff221c2efe..1b0ddfc4b3 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -376,10 +376,10 @@
 				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
 			</dependentAssembly>
 
-			<dependentAssembly>
-				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
-			</dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
 
 			<dependentAssembly>
 				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs b/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs
index 5c6db74513..4a97eac6d1 100644
--- a/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs
+++ b/src/Umbraco.Web/UI/Controls/InsertMacroSplitButton.cs
@@ -71,7 +71,8 @@ namespace Umbraco.Web.UI.Controls
 			var divMacroItemContainer = new TagBuilder("div");
 			divMacroItemContainer.Attributes.Add("style", "width: 285px;display:none;");
 			divMacroItemContainer.Attributes.Add("class", "sbMenu");
-			var macros = ApplicationContext.DatabaseContext.Database.Fetch<MacroDto>("select id, macroAlias, macroName from cmsMacro order by macroName");
+
+		    var macros = Services.MacroService.GetAll().OrderBy(x => x.Name);
 			foreach (var macro in macros)
 			{
 				var divMacro = new TagBuilder("div");
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 77883c7312..9e0ed6d4bc 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using Umbraco.Core;
@@ -194,8 +195,15 @@ namespace umbraco.cms.presentation.settings
 
 		private void LoadMacros()
 		{
-			var macroRenderings =
-				DatabaseContext.Database.Fetch<TempMacroClass>("select id, macroAlias, macroName from cmsMacro order by macroName");
+		    ;
+		    var macroRenderings =
+		        Services.MacroService.GetAll()
+		            .Select(x => new TempMacroClass()
+		            {
+		                id = x.Id,
+		                macroAlias = x.Alias,
+		                macroName = x.Name
+		            });
 
 			rpt_macros.DataSource = macroRenderings;
 			rpt_macros.DataBind();