diff --git a/boot.php b/boot.php
index f69d66be55..b67a6cebbe 100644
--- a/boot.php
+++ b/boot.php
@@ -1292,7 +1292,7 @@ function logger($msg) {
 
 if(! function_exists('activity_match')) {
 function activity_match($haystack,$needle) {
-	if(($haystack === $needle) || (($basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA)))
+	if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA)))
 		return true;
 	return false;
 }}
diff --git a/mod/profile.php b/mod/profile.php
index a39d839a92..7c01501d66 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -366,14 +366,14 @@ function profile_content(&$a, $update = 0) {
 			$drop = '';
 			$dropping = false;
 
-			if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == $_SESSION['uid']))
+			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
 				$dropping = true;
 
 			$drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id']));
 
 
-			$like    = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+			$like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 			$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 			$coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 			if($coord) {