diff --git a/.gitignore b/.gitignore
index e6151b1c3..d6bd4cf74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,4 +77,6 @@ docs/html/
 
 #NuGet
 *.nupkg
-/src/packages/
+src/packages/
+.vs/
+src/UpgradeLog.htm
diff --git a/src/corelib/OpenStackNet.cs b/src/corelib/OpenStackNet.cs
index 0e957eca3..82b8b894d 100644
--- a/src/corelib/OpenStackNet.cs
+++ b/src/corelib/OpenStackNet.cs
@@ -60,13 +60,16 @@ public static void Configure(Action<FlurlHttpConfigurationOptions> configureFlur
                 
                 FlurlHttp.Configure(c =>
                 {
-                    // Apply our default settings
-                    c.HttpClientFactory = new AuthenticatedHttpClientFactory();
-
                     // Apply the application's default settings
                     if (configureFlurl != null)
                         configureFlurl(c);
 
+                    //
+                    // Apply our default settings
+                    //
+                    if(c.HttpClientFactory is DefaultHttpClientFactory)
+                        c.HttpClientFactory = new AuthenticatedHttpClientFactory();
+
                     // Apply our event handling without clobbering any application level handlers
                     var applicationBeforeCall = c.BeforeCall;
                     c.BeforeCall = call =>
diff --git a/src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs b/src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs
index 4b8e959e3..27b2a9e49 100644
--- a/src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs
+++ b/src/testing/integration/Providers/Rackspace/UserObjectStorageTests.cs
@@ -1713,7 +1713,6 @@ public void TestExtractArchiveTar()
                     archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
                     TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
                     archive.WriteEntry(entry, true);
-                    archive.Close();
                 }
 
                 outputStream.Flush();
@@ -1769,7 +1768,6 @@ public void TestExtractArchiveTarGz()
                         archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
                         TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
                         archive.WriteEntry(entry, true);
-                        archive.Close();
                     }
                 }
 
@@ -1825,7 +1823,6 @@ public void TestExtractArchiveTarBz2()
                         archive.RootPath = Path.GetDirectoryName(Path.GetFullPath(sourceFileName)).Replace('\\', '/');
                         TarEntry entry = TarEntry.CreateEntryFromFile(sourceFileName);
                         archive.WriteEntry(entry, true);
-                        archive.Close();
                     }
                 }
 
@@ -1884,7 +1881,6 @@ public void TestExtractArchiveTarGzCreateContainer()
                         tarOutputStream.PutNextEntry(entry);
                         tarOutputStream.Write(content, 0, content.Length);
                         tarOutputStream.CloseEntry();
-                        tarOutputStream.Close();
                     }
                 }