diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index 38e8f9b..a374b48 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -32,7 +32,8 @@
 	<select name="category" class="alignleft">
 	<option label="Unfiltered" value="all">{$panelstrings.nofilter}</option>
 	{*html_options options=$lang.entry.flags.short selected=$smarty.request.cat*}
-	{html_options options=$categories_all selected=$smarty.request.category}
+	{if isset($smarty.request.category)} {assign var=category value=$smarty.request.category} {else} {assign var=category value=""}{/if}
+	{html_options options=$categories_all selected=$category}
 	</select>
 	{html_submit name='filter' id='filter' class="alignright" value=$panelstrings.filterbtn}
 </fieldset>
diff --git a/fp-plugins/bbcode/plugin.bbcode.php b/fp-plugins/bbcode/plugin.bbcode.php
index 8da1d52..5b556ce 100644
--- a/fp-plugins/bbcode/plugin.bbcode.php
+++ b/fp-plugins/bbcode/plugin.bbcode.php
@@ -191,9 +191,11 @@ function do_bbcode_img($action, $attributes, $content, $params, $node_object) {
 				// tiffs won't be supported
 
 				if (is_array($img_info)) {
-					$iptc = iptcparse($img_info ["APP13"]);
-					$title = @$iptc ["2#005"] [0] ? wp_specialchars($iptc ["2#005"] [0]) : $title;
-					$alt = isset($iptc ["2#120"] [0]) ? wp_specialchars($iptc ["2#120"] [0], 1) : $title;
+					if (isset($img_info ["APP13"])) {
+						$iptc = iptcparse($img_info ["APP13"]);
+						$title = @$iptc ["2#005"] [0] ? wp_specialchars($iptc ["2#005"] [0]) : $title;
+						$alt = isset($iptc ["2#120"] [0]) ? wp_specialchars($iptc ["2#120"] [0], 1) : $title;
+					}
 				}
 			}
 		}
diff --git a/fp-plugins/calendar/plugin.calendar.php b/fp-plugins/calendar/plugin.calendar.php
index a8cb584..9f38d2d 100755
--- a/fp-plugins/calendar/plugin.calendar.php
+++ b/fp-plugins/calendar/plugin.calendar.php
@@ -85,9 +85,9 @@ function plugin_calendar_widget() {
 
 	$days = array();
 
-	while ($q->hasmore($queryId)) {
+	while ($q->hasmore()) {
 
-		list ($id, $entry) = $q->getEntry($queryId);
+		list ($id, $entry) = $q->getEntry();
 		$date = date_from_id($id);
 		$d = (int) $date ['d'];
 
@@ -95,8 +95,6 @@ function plugin_calendar_widget() {
 			get_day_link($y, $m, str_pad($d, 2, '0', STR_PAD_LEFT)),
 			'linked-day'
 		);
-
-		$count++;
 	}
 
 	// load plugin strings