diff --git a/GoogleCloudExtension/GoogleCloudExtension.sln b/GoogleCloudExtension/GoogleCloudExtension.sln
index 6b35d0b40..ae0b2a1df 100644
--- a/GoogleCloudExtension/GoogleCloudExtension.sln
+++ b/GoogleCloudExtension/GoogleCloudExtension.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31717.71
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33027.164
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C659BF40-9EC6-415D-9EBA-17F8B820A5A2}"
 	ProjectSection(SolutionItems) = preProject
@@ -81,8 +81,8 @@ Global
 		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Debug|Any CPU.Build.0 = Debug|x86
 		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Debug|x64.ActiveCfg = Debug|x64
 		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Debug|x64.Build.0 = Debug|x64
-		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|Any CPU.ActiveCfg = Release|x64
+		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|Any CPU.Build.0 = Release|x64
 		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|x64.ActiveCfg = Release|x64
 		{BFD6AFBF-F0DB-4CE1-9681-DAE4E93F6DC5}.Release|x64.Build.0 = Release|x64
 		{21501704-9D0C-442F-AD39-292B3DA4BC57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/GoogleCloudExtension/GoogleCloudExtension/GoogleCloudExtension.csproj b/GoogleCloudExtension/GoogleCloudExtension/GoogleCloudExtension.csproj
index 5ca1e8ca8..b0f4ad1a8 100644
--- a/GoogleCloudExtension/GoogleCloudExtension/GoogleCloudExtension.csproj
+++ b/GoogleCloudExtension/GoogleCloudExtension/GoogleCloudExtension.csproj
@@ -75,7 +75,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <LangVersion>7.1</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>GoogleCloudExtension.ruleset</CodeAnalysisRuleSet>
diff --git a/GoogleCloudExtension/GoogleCloudExtension/Properties/AssemblyInfo.cs b/GoogleCloudExtension/GoogleCloudExtension/Properties/AssemblyInfo.cs
index af32006fe..59d66d9d8 100644
--- a/GoogleCloudExtension/GoogleCloudExtension/Properties/AssemblyInfo.cs
+++ b/GoogleCloudExtension/GoogleCloudExtension/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 
 // This version number matches the version in the .vsixmanifest. Please update both versions at the
 // same time.
-[assembly: AssemblyVersion("2.0.4.0")]
-[assembly: AssemblyFileVersion("2.0.4.0")]
+[assembly: AssemblyVersion("2.0.5.0")]
+[assembly: AssemblyFileVersion("2.0.5.0")]
 
 [assembly: InternalsVisibleTo(
     "GoogleCloudExtensionUnitTests," +
diff --git a/GoogleCloudExtension/GoogleCloudExtension/source.extension.vsixmanifest b/GoogleCloudExtension/GoogleCloudExtension/source.extension.vsixmanifest
index faecf34a4..eb3c8333a 100644
--- a/GoogleCloudExtension/GoogleCloudExtension/source.extension.vsixmanifest
+++ b/GoogleCloudExtension/GoogleCloudExtension/source.extension.vsixmanifest
@@ -5,7 +5,7 @@
     The Version attribute of the Identity element *must* match the version number in Properties\AssemblyInfo.cs, to ensure 
     accurate metrics.
     -->
-        <Identity Id="GoogleAppEngine.Google.d3d3eeb8-3710-4bd9-97ba-1401bf2acd22" Version="2.0.4.0" Language="en-US" Publisher="Google Cloud" />
+        <Identity Id="GoogleAppEngine.Google.d3d3eeb8-3710-4bd9-97ba-1401bf2acd22" Version="2.0.5.0" Language="en-US" Publisher="Google Cloud" />
         <DisplayName>Google Cloud Tools for Visual Studio</DisplayName>
         <Description xml:space="preserve">Tools to develop applications for Google Cloud Platform.</Description>
         <MoreInfo>https://cloud.google.com/visual-studio/</MoreInfo>
diff --git a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/GoogleCloudExtensionPackageTests.cs b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/GoogleCloudExtensionPackageTests.cs
index 4c9a4dc73..88e3d31e5 100644
--- a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/GoogleCloudExtensionPackageTests.cs
+++ b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/GoogleCloudExtensionPackageTests.cs
@@ -523,7 +523,7 @@ private async Task RunPackageInitializeAsync()
 
             IAsyncLoadablePackageInitialize packageInit = _objectUnderTest;
             // This runs the AsyncPackage.InitializeAsync() method.
-            await packageInit.Initialize(asyncServiceProviderMock.Object, null, null);
+            object p = await packageInit.Initialize((Microsoft.VisualStudio.Shell.Interop.COMAsyncServiceProvider.IAsyncServiceProvider)asyncServiceProviderMock.Object, null, null);
         }
     }
 }
diff --git a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/ServiceProviderMockExtensions.cs b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/ServiceProviderMockExtensions.cs
index cfe174c47..0276a4cca 100644
--- a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/ServiceProviderMockExtensions.cs
+++ b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/ServiceProviderMockExtensions.cs
@@ -61,7 +61,8 @@ public static void SetupService<SVsType, IVsType>(
             IMock<IVsType> serviceMock) where IVsType : class
         {
             Guid serviceGuid = typeof(SVsType).GUID;
-            Guid iUnknownGuid = typeof(IUnknown).GUID;
+            // GUID ID taken from http://pinvoke.net/default.aspx/Interfaces/IUnknown.html
+            Guid iUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
             // ReSharper disable once RedundantAssignment
             IntPtr interfacePtr = Marshal.GetIUnknownForObject(serviceMock.Object);
             serviceProviderMock.Setup(x => x.QueryService(ref serviceGuid, ref iUnknownGuid, out interfacePtr))
@@ -76,7 +77,8 @@ public static void SetupService<SVsType, IVsType>(
         public static void SetupService<SVsType>(this Mock<IServiceProvider> serviceProviderMock, object service)
         {
             Guid serviceGuid = typeof(SVsType).GUID;
-            Guid iUnknownGuid = typeof(IUnknown).GUID;
+            // GUID ID taken from http://pinvoke.net/default.aspx/Interfaces/IUnknown.html
+            Guid iUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
             // ReSharper disable once RedundantAssignment
             IntPtr interfacePtr = Marshal.GetIUnknownForObject(service);
             serviceProviderMock.Setup(x => x.QueryService(ref serviceGuid, ref iUnknownGuid, out interfacePtr))
diff --git a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/TemplateWizards/GoogleProjectSelectorTemplateWizardTests.cs b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/TemplateWizards/GoogleProjectSelectorTemplateWizardTests.cs
index 1376f7ea3..8e8c4d699 100644
--- a/GoogleCloudExtension/GoogleCloudExtensionUnitTests/TemplateWizards/GoogleProjectSelectorTemplateWizardTests.cs
+++ b/GoogleCloudExtension/GoogleCloudExtensionUnitTests/TemplateWizards/GoogleProjectSelectorTemplateWizardTests.cs
@@ -97,7 +97,8 @@ public void BeforeEach()
 
             _dteMock = new Mock<DTE>();
             Guid guidService = typeof(SVsSolution).GUID;
-            Guid uuid = typeof(IUnknown).GUID;
+            // GUID ID taken from http://pinvoke.net/default.aspx/Interfaces/IUnknown.html
+            Guid uuid = new Guid("00000000-0000-0000-C000-000000000046");
             _newHierarchy = Mock.Of<IVsHierarchy>();
             _solutionMock = new Mock<IVsSolution6>();
             _solutionMock.Setup(