diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index d2bdc08d7..4d25bac6a 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -492,12 +492,12 @@ class adminstyle_infopanel
 		{
 			$hide = ($count > 3) ? ' hide' : '';
 
-			$TEMPLATE = "{SETIMAGE: w=40}
+			$TEMPLATE = "{SETIMAGE: w=40&h=40}
 			<li id='comment-".$row['comment_id']."' class='media".$hide."'>
 				<span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span> 
 				<div class='btn-group pull-right'>
-	            	<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
-	            	<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
+	            	<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-sm btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
+	            	<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
 	            </div>
 				<div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br />
 					<p>{COMMENT}</p> 
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 10498c5a1..7d5323472 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -3003,10 +3003,11 @@ class e107plugin
 
 		$ret['menuName'] = varset($eplug_menu_name);
 
-		if (varset($eplug_prefs))
+
+		if (!empty($eplug_prefs) && is_array($eplug_prefs))
 		{
 			$c = 0;
-			foreach ($eplug_prefs as $name => $value)
+			foreach($eplug_prefs as $name => $value)
 			{
 				$ret['mainPrefs']['pref'][$c]['@attributes']['name'] = $name;
 				$ret['mainPrefs']['pref'][$c]['@value'] = $value;
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 092bf74fc..7a909a90e 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -413,7 +413,7 @@ class pm_shortcodes extends e_shortcode
 
 	public function sc_pm_avatar()
 	{
-		return e107::getParser()->parseTemplate("{USER_AVATAR={$this->var['user_image']}}");
+		return e107::getParser()->toAvatar($this->var); 
 	}