diff --git a/include/like.php b/include/like.php
index 94ff33a699..feaffe011b 100644
--- a/include/like.php
+++ b/include/like.php
@@ -166,7 +166,6 @@ function do_like($item_id, $verb) {
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
 		$post_type = t('event');
-	}
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
diff --git a/mod/proxy.php b/mod/proxy.php
index 3fdb250b5c..e14f08570c 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -140,17 +140,23 @@ function proxy_init(App $a) {
 	if (!$direct_cache AND ($cachefile == '')) {
 		$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
 		if (dbm::is_result($r)) {
+<<<<<<< HEAD
 <<<<<<< origin/rewrites/app_get_baseurl_static
         		$img_str = $r[0]['data'];
 			$mime = $r[0]["desc"];
 			if ($mime == "") $mime = "image/jpeg";
 =======
+=======
+>>>>>>> upstream/develop
 			$img_str = $r[0]['data'];
 			$mime = $r[0]['desc'];
 			if ($mime == '') {
 				$mime = 'image/jpeg';
 			}
+<<<<<<< HEAD
 >>>>>>> HEAD~0
+=======
+>>>>>>> upstream/develop
 		}
 	} else {
 		$r = array();
diff --git a/view/theme/frio/js/hovercard.js b/view/theme/frio/js/hovercard.js
index 6e2a827cd6..d9f9429164 100644
--- a/view/theme/frio/js/hovercard.js
+++ b/view/theme/frio/js/hovercard.js
@@ -79,7 +79,8 @@ $(document).ready(function(){
 									},
 									trigger: hctrigger,
 									template: '<div class="popover hovercard" data-card-created="' + timeNow + '"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
-									content: data
+									content: data,
+									container: "body",
 								}).popover('show');
 							}
 						});
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 8fbee06e51..3f3128be40 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -100,6 +100,7 @@ $(document).ready(function(){
 	// initialize the bootstrap tooltips
 	$('body').tooltip({
 		selector: '[data-toggle="tooltip"]',
+		container: 'body',
 		animation: true,
 		html: true,
 		placement: 'auto',
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 5732e12113..390cf58dc4 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -278,7 +278,7 @@
 <ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template">
 	<li class="{4} notif-entry">
 		<div class="notif-entry-wrapper media">
-			<div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>
+			<div class="notif-photo-wrapper media-object pull-left"><a href="{6}" class="userinfo"><img data-src="{1}"></a></div>
 			<a href="{0}" class="notif-desc-wrapper media-body">
 				{2}
 				<div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>