diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index cd0730d9..acdef615 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -222,7 +222,9 @@
 } 
 if (check_perms('site_collages_subscribe')) { ?>
 		<a href="userhistory.php?action=subscribed_collages">[My Subscribed Collages]</a>
-<? }
+<? } ?>
+		<a href="bookmarks.php?type=collages">[Bookmarked Collages]</a>
+<?
 if (check_perms('site_collages_recover')) { ?>
 		<a href="collages.php?action=recover">[Recover collage]</a>
 <?
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index e7a54f03..703f0531 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -29,9 +29,9 @@
 				<td>
 					<select name="category">
 <?
-	if (!check_perms('site_collages_delete')) { array_shift($CollageCats); }
-	foreach($CollageCats as $CatID=>$CatName) { ?>
-						<option value="<?=$CatID?>" <? if($CatID == $CategoryID) { echo ' selected="selected"'; }?>><?=$CatName?></option>
+	foreach($CollageCats as $CatID=>$CatName) { 
+		if (!check_perms('site_collages_delete') && $CatID == 0) { continue; } // Only mod-type get to make things personal ?>
+		<option value="<?=$CatID?>" <? if($CatID == $CategoryID) { echo ' selected="selected"'; }?>><?=$CatName?></option>
 <?	} ?>
 					</select>
 				</td>
diff --git a/sections/torrents/takeedit.php b/sections/torrents/takeedit.php
index 4de5e1fc..6ee3f0ec 100644
--- a/sections/torrents/takeedit.php
+++ b/sections/torrents/takeedit.php
@@ -83,6 +83,9 @@
 //--------------- Validate data in edit form -----------------------------------//
 
 $DB->query('SELECT UserID, Remastered, RemasterYear, FreeTorrent FROM torrents WHERE ID='.$TorrentID);
+if($DB->record_count() == 0) {
+	error(404);
+}
 list($UserID, $Remastered, $RemasterYear, $CurFreeLeech) = $DB->next_record(MYSQLI_BOTH, false);
 
 if($LoggedUser['ID']!=$UserID && !check_perms('torrents_edit')) {
@@ -93,13 +96,9 @@
 	error(403);
 }
 
-$DB->query("SELECT UserID FROM torrents WHERE ID = ".$TorrentID);
-list($UploaderID) = $DB->next_record();
-
-
 if($Properties['UnknownRelease'] && !($Remastered == '1' && !$RemasterYear) && !check_perms('edit_unknowns')) {
 	//It's Unknown now, and it wasn't before
-	if($LoggedUser['ID'] != $UploaderID) {
+	if($LoggedUser['ID'] != $UserID) {
 		//Hax
 		die();
 	}