diff --git a/Core/VersionInfo.cs b/Core/VersionInfo.cs
index 0d55c26..4cf94dd 100644
--- a/Core/VersionInfo.cs
+++ b/Core/VersionInfo.cs
@@ -9,7 +9,7 @@ public class VersionInfo
     {
         // BIDS Helper Assembly & VSIX Version
         // N.B. Manually update the manifest file, if you change this - See source.extension.vsixmanifest
-        public const string Version = "2.3.2";
+        public const string Version = "2.3.3";
 
         private static readonly object lockResource = new object();
         private static Version visualStudioVersion;
diff --git a/Manifest/SQL2017/VSPackageVS2017.resx b/Manifest/SQL2017/VSPackageVS2017.resx
index 13d721b..67a31fa 100644
--- a/Manifest/SQL2017/VSPackageVS2017.resx
+++ b/Manifest/SQL2017/VSPackageVS2017.resx
@@ -121,7 +121,7 @@
     <value>BI Developer Extensions for Visual Studio 2017</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>BI Developer Extensions v2.3.2 for Visual Studio 2017 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions v2.3.3 for Visual Studio 2017 - An add-in to extend SQL Server Data Tools</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
diff --git a/Manifest/SQL2017/source.extension.vsixmanifest b/Manifest/SQL2017/source.extension.vsixmanifest
index 534f1fb..9a5d86a 100644
--- a/Manifest/SQL2017/source.extension.vsixmanifest
+++ b/Manifest/SQL2017/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.2" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d873" Version="2.3.3" Language="en-US" Publisher="bideveloperextensions.github.io" />
         <DisplayName>BI Developer Extensions for Visual Studio 2017</DisplayName>
         <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects</Description>
         <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>
diff --git a/Manifest/SQL2019/VSPackageVS2019.resx b/Manifest/SQL2019/VSPackageVS2019.resx
index d052132..9640de0 100644
--- a/Manifest/SQL2019/VSPackageVS2019.resx
+++ b/Manifest/SQL2019/VSPackageVS2019.resx
@@ -121,7 +121,7 @@
     <value>BI Developer Extensions for Visual Studio 2019</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>BI Developer Extensions v2.3.2 for Visual Studio 2019 - An add-in to extend SQL Server Data Tools</value>
+    <value>BI Developer Extensions v2.3.3 for Visual Studio 2019 - An add-in to extend SQL Server Data Tools</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
diff --git a/Manifest/SQL2019/source.extension.vsixmanifest b/Manifest/SQL2019/source.extension.vsixmanifest
index cc4af9b..13e0bb1 100644
--- a/Manifest/SQL2019/source.extension.vsixmanifest
+++ b/Manifest/SQL2019/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.2" Language="en-US" Publisher="bideveloperextensions.github.io" />
+        <Identity Id="BIDSHelper_VSIX.b6deed2d-6c6f-46d4-94be-28027bf7d874" Version="2.3.3" Language="en-US" Publisher="bideveloperextensions.github.io" />
         <DisplayName>BI Developer Extensions for Visual Studio 2019</DisplayName>
         <Description xml:space="preserve">BI Developer Extensions (formerly BIDS Helper) is an extension for BIDS / SSDT that includes numerous enhancements for SQL Server BI projects</Description>
         <MoreInfo>https://bideveloperextensions.github.io</MoreInfo>
@@ -11,7 +11,7 @@
         <Tags>SSDT,SSIS,SSAS,SSRS,BIDS,SQL Server Data Tools,Integration Services,Analysis Services,Reporting Services</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="16.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="[16.0, 17.0)" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
diff --git a/SSIS/ParametersWindowPlugin.cs b/SSIS/ParametersWindowPlugin.cs
index 8bfa751..b37b721 100644
--- a/SSIS/ParametersWindowPlugin.cs
+++ b/SSIS/ParametersWindowPlugin.cs
@@ -133,7 +133,7 @@ public class ParametersWindowManager
         private ToolBarButton findReferencesButton;
         private ToolBarButton findUnusedButton;
         private UserControl variablesToolWindowControl;
-        private DlgGridControl grid;
+        private Microsoft.DataTransformationServices.Controls.DlgGridControl grid;
         private EditorWindow editorWindow;
         private bool setupComplete;
 
@@ -199,7 +199,7 @@ private void SetupControl()
             toolbar.Wrappable = false;
 
             // "tableLayoutPanelMain" - "tableLayoutPanelParameter" - "parameterGridControl"
-            grid = (DlgGridControl)variablesToolWindowControl.Controls[0].Controls[1].Controls[0];
+            grid = (Microsoft.DataTransformationServices.Controls.DlgGridControl)variablesToolWindowControl.Controls[0].Controls[1].Controls[0];
             grid.SelectionChanged += new SelectionChangedEventHandler(grid_SelectionChanged);
             grid.Invalidated += new InvalidateEventHandler(grid_Invalidated);