diff --git a/code/admin/controllers/keys.php b/code/admin/controllers/keys.php
index 5482e91..7c7baaf 100644
--- a/code/admin/controllers/keys.php
+++ b/code/admin/controllers/keys.php
@@ -30,7 +30,7 @@ class ApiControllerKeys extends AdminController
 	 *
 	 * @since   3.0
 	 */
-	public function getModel($name = 'key', $prefix = 'ApiModel')
+	public function getModel($name = 'key', $prefix = 'ApiModel', $config = array())
 	{
 		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
 
diff --git a/code/site/controllers/http.php b/code/site/controllers/http.php
index 5afb853..d29b12b 100644
--- a/code/site/controllers/http.php
+++ b/code/site/controllers/http.php
@@ -179,7 +179,13 @@ private function resetDocumentType()
 		{
 			foreach (headers_list() as $header)
 			{
-				header_remove($header);
+				$headerParts = explode(":", $header);
+
+				if (is_array($headerParts) && isset($headerParts[0]))
+				{
+					$headerToRemove = trim($headerParts[0]);
+					header_remove($headerToRemove);
+				}
 			}
 		}
 		//JResponse::clearHeaders();