diff --git a/CONTROL/control b/CONTROL/control
index 6207c57..0b90d24 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.7
+Version: 0.8.7-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.2),ssmtp,anacron
diff --git a/var/mongoose/cgi-bin/browse/mdelete.jim b/var/mongoose/cgi-bin/browse/mdelete.jim
index 841beef..1d61481 100755
--- a/var/mongoose/cgi-bin/browse/mdelete.jim
+++ b/var/mongoose/cgi-bin/browse/mdelete.jim
@@ -29,7 +29,7 @@ foreach file [split [cgi_get files] ","] {
 			puts -nonewline "Done..."
 		}
 	} else {
-		if {[catch {file delete $ts} msg]} {
+		if {[catch {file delete $file} msg]} {
 			puts -nonewline "Error: $msg"
 		} else {
 			catch {file delete "[file rootname $file].hmi"}
diff --git a/var/mongoose/cgi-bin/dedup.jim b/var/mongoose/cgi-bin/dedup.jim
index f75f849..2812469 100755
--- a/var/mongoose/cgi-bin/dedup.jim
+++ b/var/mongoose/cgi-bin/dedup.jim
@@ -40,6 +40,7 @@ foreach file [lsort [glob -nocomplain "$sdir"]] {
 	puts "<td nowrap>$base</td>"
 	set syn [$ts get synopsis]
 	regsub -nocase -all -- {^new series\.* *} $syn "" syn
+	regsub -nocase -all -- {^cbeebies\. *} $syn "" syn
 	regsub -all -- { *[:].*$} $syn "" syn
 	if {[string length $syn] > 40} {
 		lassign [split $syn "."] v w
diff --git a/var/mongoose/lib/classdump b/var/mongoose/lib/classdump
new file mode 100644
index 0000000..3179bcd
--- /dev/null
+++ b/var/mongoose/lib/classdump
@@ -0,0 +1,9 @@
+
+if {[expr ! [exists -proc classdump]]} {
+	proc classdump {o} {
+		foreach var [$o vars] {
+			puts [format {%20s %s} $var [$o get $var]]
+		}
+	}
+}
+
diff --git a/var/mongoose/lib/rsv.class b/var/mongoose/lib/rsv.class
index 9afb37a..48e8bb7 100755
--- a/var/mongoose/lib/rsv.class
+++ b/var/mongoose/lib/rsv.class
@@ -338,6 +338,11 @@ proc {rsv construct} {event type} {
 
 	set ccrid [$event get channel_crid]
 
+	# Fallback from series to event if there is no series CRID.
+	if {$type == 2 && [$event get series_crid] eq ""} {
+		set type 1
+	}
+
 	if {$type == 1} {
 		# Event
 		set args(ucCRIDType)		49