diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php
index 384c1d66f..acd4ad093 100644
--- a/upload/ajax/view_torrent.php
+++ b/upload/ajax/view_torrent.php
@@ -35,7 +35,7 @@ $tor_filelist = build_tor_filelist($file_contents);
 function build_tor_filelist ($file_contents)
 {
     global $lang;
-	
+
 	if (!$tor = bdecode($file_contents))
 	{
 		return $lang['TORFILE_INVALID'];
@@ -127,7 +127,7 @@ class torrent
 						{
 							if (is_string($cur_files_ary))
 							{
-								$this->ajax_die($lang['ERROR_BUILD']);
+								bb_die($lang['ERROR_BUILD']);
 							}
 							$cur_files_ary[] = $this->build_file_item($name, $length);
 						}
diff --git a/upload/config.php b/upload/config.php
index c6bbee384..80486a209 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.2 Beta';
-$bb_cfg['tp_release_state'] = 'R312';
+$bb_cfg['tp_release_state'] = 'R313';
 $bb_cfg['tp_release_date'] = '13-11-2011';
 
 // Database
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index b0c2af6d2..dfc830ea0 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -370,9 +370,9 @@ $post_order = (isset($_POST['postorder']) && $_POST['postorder'] !== 'asc') ? 'd
 //
 // 1. Add first post of topic if it pinned and page of topic not first
 $first_post = false;
-if ($t_data['topic_show_first_post'] && ( $start != 0))
+if ($t_data['topic_show_first_post'] && $start)
 {
-	$first_post = DB()->fetch_rowset("
+	$first_post = DB()->fetch_row("
 		SELECT
 		  u.username, u.user_id, u.user_posts, u.user_from,
 		  u.user_regdate, u.user_rank, u.user_sig,