diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 08d4149a71..2719044a10 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -21,11 +21,13 @@ function update_gcontact_run(&$argv, &$argc){
 
 	$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-	if (!$r)
+	if (!dbm::_is_result($r)) {
 		return;
+	}
 
 	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
 		return;
+	}
 
 	$data = probe_url($r[0]["url"]);
 
diff --git a/mod/photos.php b/mod/photos.php
index e4548bb468..a54aff326a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -638,7 +638,7 @@ function photos_post(App $a) {
 							}
 						}
 						if ($profile) {
-							if (substr($notify,0,4) === 'cid:') {
+							if (substr($notify, 0, 4) === 'cid:') {
 								$taginfo[] = array($newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
 							} else {
 								$taginfo[] = array($newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
@@ -1427,8 +1427,8 @@ function photos_content(App $a) {
 		}
 
 		$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
- 		$tools = null;
- 		$lock = null;
+		$tools = null;
+		$lock = null;
 
 		if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
 			$tools = array(