diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php
index ae7a7beb8..3d187c2da 100644
--- a/addons/member_communication/member_communication.addon.php
+++ b/addons/member_communication/member_communication.addon.php
@@ -23,7 +23,7 @@ if(!$logged_info)
 /**
  * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
  * */
-if($called_position == 'before_module_init' && $this->module != 'member')
+if($this->module != 'member' && $called_position == 'before_module_init')
 {
 	// Load a language file from the communication module
 	Context::loadLang(_XE_PATH_ . 'modules/communication/lang');
@@ -31,34 +31,29 @@ if($called_position == 'before_module_init' && $this->module != 'member')
 	$oMemberController = getController('member');
 	$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
 	$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
-	// Pop-up to display messages if a flag on new message is set
-	$flag_path = _XE_PATH_ . 'files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl);
-	$flag_file = $flag_path . $logged_info->member_srl;
 
-	if(file_exists($flag_file) && $addon_info->use_alarm != 'N')
+	if($addon_info->use_alarm != 'N');
 	{
-		$new_message_count = trim(FileHandler::readFile($flag_file));
+		// Pop-up to display messages if a flag on new message is set
+		$flag_file = _XE_PATH_ . 'files/member_extra_info/new_message_flags/' . getNumberingPath($logged_info->member_srl) . $logged_info->member_srl;
+		$new_message_count = (int) trim(FileHandler::readFile($flag_file));
 		FileHandler::removeFile($flag_file);
 		Context::loadLang(_XE_PATH_ . 'addons/member_communication/lang');
 		Context::loadFile(array('./addons/member_communication/tpl/member_communication.js'), true);
 
 		$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
-		$link = Context::getRequestUri() . '?module=communication&act=dispCommunicationNewMessage';
-		$script = "<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>";
-
-		Context::addHtmlFooter($script);
+		Context::addHtmlFooter("<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 	}
 }
-elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu')
+elseif($this->act == 'getMemberMenu' && $called_position == 'before_module_proc');
 {
-	$oMemberController = getController('member');
 	$member_srl = Context::get('target_srl');
-	$mid = Context::get('cur_mid');
-	// Creates communication model object
-	$oCommunicationModel = getModel('communication');
+
 	// Add a feature to display own message box.
 	if($logged_info->member_srl == $member_srl)
 	{
+		$mid = Context::get('cur_mid');
+		$oMemberController = getController('member');
 		// Add your own viewing Note Template
 		$oMemberController->addMemberPopupMenu(getUrl('', 'mid', $mid, 'act', 'dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
 		// Display a list of friends
@@ -75,8 +70,8 @@ elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu'
 			return;
 		}
 
-		// Get logged-in user information
-		$logged_info = Context::get('logged_info');
+		$oMemberController = getController('member');
+		$oCommunicationModel = getModel('communication');
 		// Add a menu for sending message
 		if($logged_info->is_admin == 'Y' || $target_member_info->allow_message == 'Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
 			$oMemberController->addMemberPopupMenu(getUrl('', 'module', 'communication', 'act', 'dispCommunicationSendMessage', 'receiver_srl', $member_srl), 'cmd_send_message', '', 'popup');
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index 999e1f021..3eb2a61d8 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -54,6 +54,7 @@ function pointLevelIconTrans($matches)
 		$level_icon = sprintf('%smodules/point/icons/%s/%d.gif', Context::getRequestUri(), $config->level_icon, $level);
 
 		// Get per to go to the next level if not a top level
+		$per = NULL;
 		if($level < $config->max_level)
 		{
 			$next_point = $config->level_step[$level + 1];
@@ -68,7 +69,7 @@ function pointLevelIconTrans($matches)
 		$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', Context::getLang('level'), $level, $config->max_level);
 		$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
 
-		$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" style="vertical-align:middle; margin-right:3px;" />', $level_icon, $alt, $title);
+		$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" class="xe_point_level_icon" style="vertical-align:middle;margin-right:3px;" />', $level_icon, $alt, $title);
 	}
 	$text = $GLOBALS['_pointLevelIcon'][$member_srl];