diff --git a/e107_core/templates/login_template.php b/e107_core/templates/login_template.php
index b9d9a982d..f1ec8ad36 100644
--- a/e107_core/templates/login_template.php
+++ b/e107_core/templates/login_template.php
@@ -85,7 +85,7 @@ if(!isset($LOGIN_TABLE_FOOTER))
 $LOGIN_TEMPLATE['page']['header'] = "
 	<div id='login-template'>
 		<div class='center'>
-			{LOGO=login}
+			{LOGO: login}
 		</div>";
 
 $LOGIN_TEMPLATE['page']['body'] = '
diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php
index debdfa5d8..28ba0c124 100644
--- a/e107_plugins/siteinfo/e_shortcode.php
+++ b/e107_plugins/siteinfo/e_shortcode.php
@@ -93,7 +93,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 		return $this->sc_logo($parm);	
 	}
 
-	function sc_logo($parm = '')
+	function sc_logo($parm = array())
 	{
 		if(is_string($parm))
 		{
@@ -105,7 +105,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 		$logopref = e107::getConfig('core')->get('sitelogo');
 		$logop = $tp->replaceConstants($logopref);
 
-		if($parm == 'login' || isset($parm['login'])) // Login Page. BC fix.
+		if(isset($parm['login'])) // Login Page. BC fix.
 		{
 
 			if(!empty($logopref) && is_readable($logop))
diff --git a/e107_web/js/plupload/upload.php b/e107_web/js/plupload/upload.php
index 0c6dadd5d..7565bd451 100644
--- a/e107_web/js/plupload/upload.php
+++ b/e107_web/js/plupload/upload.php
@@ -232,7 +232,7 @@
 		}
 
 	}
-	
+
 
 	if(!empty($_GET['for'])) // leave in upload directory if no category given.
 	{