Really don't use globals
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index cd3827c..f08e78b 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -88,8 +88,7 @@
 	 */
 	function entity_decode($str, $charset = NULL)
 	{
-		global $SEC;
-		return $SEC->entity_decode($str, $charset);
+		return get_instance()->security->entity_decode($str, $charset);
 	}
 }
 
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index e8e06d7..bed18eb 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -203,15 +203,17 @@
 	 */
 	public function parseRequest($data = '')
 	{
-		global $HTTP_RAW_POST_DATA;
-
 		//-------------------------------------
 		//  Get Data
 		//-------------------------------------
 
 		if ($data === '')
 		{
-			$data = $HTTP_RAW_POST_DATA;
+			$CI =& get_instance();
+			if ($CI->input->method() === 'post')
+			{
+				$data = http_build_query($CI->input->input_stream(NULL, FALSE));
+			}
 		}
 
 		//-------------------------------------
@@ -222,13 +224,13 @@
 		$parser_object = new XML_RPC_Message('filler');
 
 		$parser_object->xh[$parser] = array(
-							'isf' =>	0,
-							'isf_reason' =>	'',
-							'params' =>	array(),
-							'stack' =>	array(),
-							'valuestack' =>	array(),
-							'method' =>	''
-						);
+			'isf' =>	0,
+			'isf_reason' =>	'',
+			'params' =>	array(),
+			'stack' =>	array(),
+			'valuestack' =>	array(),
+			'method' =>	''
+		);
 
 		xml_set_object($parser, $parser_object);
 		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, TRUE);