diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index cd2f53a7df..44a943e198 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Core
         /// <summary>
         /// Returns the name of the dataprovider from the connectionstring setting in config
         /// </summary>
-        public string ProviderName
+        internal string ProviderName
         {
             get
             {
@@ -298,15 +298,14 @@ namespace Umbraco.Core
 
         internal Result CreateDatabaseSchemaAndData()
         {
-            var providerName = string.IsNullOrEmpty(_providerName) ? ProviderName : _providerName;
-            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(providerName)))
+            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
             {
                 return new Result{Message = "Database configuration is invalid", Success = false, Percentage = "10"};
             }
 
             try
             {
-                var database = new Database(_connectionString, providerName);
+                var database = new Database(_connectionString, ProviderName);
                 database.CreateDatabaseSchema();
                 return new Result { Message = "Installation completed!", Success = true, Percentage = "100" };
             }
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index da129c7aca..8f677be100 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -360,11 +360,11 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                 return column.CustomType;
 
             var dbType = DbTypeMap.ColumnDbTypeMap.First(x => x.Value == column.Type.Value).Key;
-            var definition = DbTypeMap.ColumnDbTypeMap.First(x => x.Key == dbType).Value;
+            var definition = DbTypeMap.ColumnTypeMap.First(x => x.Key == dbType).Value;
 
             string dbTypeDefinition = column.Size != default(int)
                                           ? string.Format("{0}({1})", definition, column.Size)
-                                          : definition.ToString();
+                                          : definition;
             //NOTE Percision is left out
             return dbTypeDefinition;
         }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 1e4474c7ba..e952407112 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -534,6 +534,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Persistence\DatabaseModelDefinitions\" />
     <Folder Include="Persistence\Migrations\Syntax\Schema\Index\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />