diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index e84a42734..58bb11670 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -23,15 +23,11 @@ function fsuggest_post(App $a)
 
 	$contact_id = intval($a->argv[1]);
 
-	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($contact_id),
-		intval(local_user())
-	);
-	if (! DBA::isResult($r)) {
+	$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+	if (! DBA::isResult($contact)) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
-	$contact = $r[0];
 
 	$new_contact = intval($_POST['suggest']);
 
@@ -49,10 +45,10 @@ function fsuggest_post(App $a)
 				VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
 				intval(local_user()),
 				intval($contact_id),
-				DBA::escape($r[0]['name']),
-				DBA::escape($r[0]['url']),
-				DBA::escape($r[0]['request']),
-				DBA::escape($r[0]['photo']),
+				DBA::escape($contact['name']),
+				DBA::escape($contact['url']),
+				DBA::escape($contact['request']),
+				DBA::escape($contact['photo']),
 				DBA::escape($hash),
 				DBA::escape(DateTimeFormat::utcNow())
 			);
@@ -61,7 +57,7 @@ function fsuggest_post(App $a)
 				intval(local_user())
 			);
 			if (DBA::isResult($r)) {
-				$fsuggest_id = $r[0]['id'];
+				$fsuggest_id = $contact['id'];
 				q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
 					DBA::escape($note),
 					intval($fsuggest_id),
@@ -88,16 +84,11 @@ function fsuggest_content(App $a)
 
 	$contact_id = intval($a->argv[1]);
 
-	$r = q(
-		"SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($contact_id),
-		intval(local_user())
-	);
-	if (! DBA::isResult($r)) {
+	$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+	if (! DBA::isResult($contact)) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
-	$contact = $r[0];
 
 	$o = '<h3>' . L10n::t('Suggest Friends') . '</h3>';
 
diff --git a/mod/photos.php b/mod/photos.php
index 2171309e8..710a3873e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -409,9 +409,12 @@ function photos_post(App $a)
 			}
 		}
 
-		$photo = Photo::getPhotoForUser($page_owner_uid, $resource_id);
+		$photos_stmt = DBA::select('photo', [], ['resource-id' => $resource_id, 'uid' => $page_owner_uid], ['order' => ['scale' => true]]);
 
-		if (DBA::isResult($photo)) {
+		$photos = DBA::toArray($photos_stmt);
+
+		if (DBA::isResult($photos)) {
+			$photo = $photos[0];
 			$ext = $phototypes[$photo['type']];
 			Photo::update(
 				['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny],
@@ -422,16 +425,15 @@ function photos_post(App $a)
 			if ($albname !== $origaname) {
 				Photo::clearAlbumCache($page_owner_uid);
 			}
+			/* Don't make the item visible if the only change was the album name */
+
+			$visibility = 0;
+			if ($photo['desc'] !== $desc || strlen($rawtags)) {
+				$visibility = 1;
+			}
 		}
 
-		/* Don't make the item visible if the only change was the album name */
-
-		$visibility = 0;
-		if ($photo['desc'] !== $desc || strlen($rawtags)) {
-			$visibility = 1;
-		}
-
-		if (!$item_id) {
+		if (DBA::isResult($photos) && !$item_id) {
 			// Create item container
 			$title = '';
 			$uri = Item::newURI($page_owner_uid);
@@ -527,7 +529,7 @@ function photos_post(App $a)
 							if ($tagcid) {
 								$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 									intval($tagcid),
-									intval($profile_uid)
+									intval($page_owner_uid)
 								);
 							} else {
 								$newname = str_replace('_',' ',$name);
@@ -598,7 +600,7 @@ function photos_post(App $a)
 			Item::update($fields, $condition);
 
 			$best = 0;
-			foreach ($p as $scales) {
+			foreach ($photos as $scales) {
 				if (intval($scales['scale']) == 2) {
 					$best = 2;
 					break;
@@ -646,13 +648,13 @@ function photos_post(App $a)
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
 					$arr['object'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
 					if ($tagged[3]) {
-						$arr['object'] .= XML::escape('<link rel="photo" type="'.$photo['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
+						$arr['object'] .= XML::escape('<link rel="photo" type="' . $photo['type'] . '" href="' . $tagged[3]['photo'] . '" />' . "\n");
 					}
 					$arr['object'] .= '</link></object>' . "\n";
 
 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $photo['desc'] . '</title><id>'
 						. System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '</id>';
-					$arr['target'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$photo['type'].'" href="' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
+					$arr['target'] .= '<link>' . XML::escape('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . '" />' . "\n" . '<link rel="preview" type="' . $photo['type'] . '" href="' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 
 					Item::insert($arr);
 				}