diff --git a/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj b/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj
index cb4d97b..bdee001 100644
--- a/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj
+++ b/Csg.Data.Sql.Tests/Csg.Data.Sql.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>3.1.6</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net471</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>Csg.Data.Sql.Tests</AssemblyName>
     <AssemblyOriginatorKeyFile>../build/key.snk</AssemblyOriginatorKeyFile>
@@ -33,7 +33,7 @@
     <PackageReference Include="System.ValueTuple" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net471' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs b/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs
index 46f3457..374639f 100644
--- a/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs
+++ b/Csg.Data.Sql.Tests/DbQueryBuilderTests.cs
@@ -23,12 +23,43 @@ public void TestCreateCommandPopulatesCommandParameters()
 
             query.Parameters.Add(new DbParameterValue()
             {
-                ParameterName  = "@Param1",
+                ParameterName = "@Param1",
+                DbType = System.Data.DbType.Int32,
+                Size = 4,
+                Value = 123
+            });
+
+            var stmt = query.Render();
+
+            Assert.AreEqual(1, stmt.Parameters.Count);
+            Assert.AreEqual(System.Data.DbType.Int32, stmt.Parameters.First().DbType);
+            Assert.AreEqual(4, stmt.Parameters.First().Size);
+            Assert.AreEqual(123, stmt.Parameters.First().Value);
+
+            var cmd = stmt.CreateCommand(conn);
+
+            Assert.AreEqual(conn, cmd.Connection);
+            Assert.AreEqual(1, cmd.Parameters.Count);
+            Assert.AreEqual(System.Data.DbType.Int32, ((IDbDataParameter)cmd.Parameters[0]).DbType);
+            Assert.AreEqual(4, ((IDbDataParameter)cmd.Parameters[0]).Size);
+            Assert.AreEqual(123, ((IDbDataParameter)cmd.Parameters[0]).Value);
+        }
+
+        [TestMethod]
+        public void TestCreateCommandPopulatesCommandParametersAndPrefix()
+        {
+            var conn = new MockConnection();
+            var query = new DbQueryBuilder("dbo.TableName", conn);
+
+            query.Parameters.Add(new DbParameterValue()
+            {
+                ParameterName = "@Param1",
                 DbType = System.Data.DbType.Int32,
                 Size = 4,
                 Value = 123
             });
 
+            query.Prefix("test"); 
             var stmt = query.Render();
 
             Assert.AreEqual(1, stmt.Parameters.Count);
@@ -43,6 +74,8 @@ public void TestCreateCommandPopulatesCommandParameters()
             Assert.AreEqual(System.Data.DbType.Int32, ((IDbDataParameter)cmd.Parameters[0]).DbType);
             Assert.AreEqual(4, ((IDbDataParameter)cmd.Parameters[0]).Size);
             Assert.AreEqual(123, ((IDbDataParameter)cmd.Parameters[0]).Value);
+            Assert.AreEqual("test;SELECT * FROM [dbo].[TableName] AS [t0];", cmd.CommandText);
+            
         }
 
         [TestMethod]
diff --git a/Csg.Data/Csg.Data.csproj b/Csg.Data/Csg.Data.csproj
index 0a656d5..2e1fa76 100644
--- a/Csg.Data/Csg.Data.csproj
+++ b/Csg.Data/Csg.Data.csproj
@@ -2,7 +2,7 @@
     
   <PropertyGroup>
     <Description>Tools for data access and database query generation.</Description>
-    <TargetFrameworks>net461;net451;net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <PackageId>Csg.Data</PackageId>
     <PackageIcon>icon.png</PackageIcon>
     <AssemblyName>Csg.Data</AssemblyName>
@@ -16,7 +16,7 @@
     <PackageIcon>icon.png</PackageIcon>
   </PropertyGroup>
     
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net461|AnyCPU'">
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;</NoWarn>
   </PropertyGroup>
     
@@ -24,21 +24,6 @@
     <PackageReference Include="System.Data.Common" Version="4.1.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Linq.Queryable" Version="4.0.1" />
     <PackageReference Include="System.Reflection" Version="4.1.0" />
diff --git a/Csg.Data/DbQueryBuilderExtensions.cs b/Csg.Data/DbQueryBuilderExtensions.cs
index 8e0ccbf..2a79983 100644
--- a/Csg.Data/DbQueryBuilderExtensions.cs
+++ b/Csg.Data/DbQueryBuilderExtensions.cs
@@ -423,7 +423,6 @@ public static IDbQueryBuilder Limit(this IDbQueryBuilder query, int limit=0, int
         /// <returns></returns>
         public static IDbQueryBuilder Prefix(this IDbQueryBuilder query, string prefix)
         {
-            query = query.Fork();
             query.Prefix = prefix;
             return query;
         }
diff --git a/version.json b/version.json
index 07ae3f0..cbc3031 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
-  "version": "3.3", // required (unless the "inherit" field is set to true and a parent version.json file sets this.)
-  "assemblyVersion": "3.3", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property.
+  "version": "4.0", // required (unless the "inherit" field is set to true and a parent version.json file sets this.)
+  "assemblyVersion": "4.0", // optional. Use when x.y for AssemblyVersionAttribute differs from the default version property.
   "nugetPackageVersion": {
     "semVer": 1 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
   },