--- MythTV.pm.orig	2007-11-22 16:48:36.000000000 +1300
+++ MythTV.pm	2007-11-22 16:49:18.000000000 +1300
@@ -7,6 +7,8 @@
 # @author    $Author: xris $
 #
 
+package MythTV;
+
 # Version
     $VERSION = '.20';
 
@@ -16,7 +18,7 @@
     use MythTV::Channel;
 
 # Define some constants
-    use constant {
+    use constant ( {
                  # Constants for the recording types
                   rectype_once       =>  1,
                   rectype_daily      =>  2,
@@ -34,9 +36,7 @@
                   searchtype_keyword => 3,
                   searchtype_people  => 4,
                   searchtype_manual  => 5,
-                 };
-
-package MythTV;
+    } );
 
     use IO::Socket;
     use Sys::Hostname;
--- MythTV/Program.pm.orig	2007-11-22 16:48:12.000000000 +1300
+++ MythTV/Program.pm	2007-11-22 16:48:12.000000000 +1300
@@ -98,7 +98,7 @@
         $self->{'is_editing'}   = ($self->{'progflags'} & 0x08) ? 1 : 0;    # FL_EDITING   = 0x08
         $self->{'bookmark'}     = ($self->{'progflags'} & 0x10) ? 1 : 0;    # FL_BOOKMARK  = 0x10
     # And some other calculated fields
-        $self->{'will_record'} = ($self->{'rectype'} && $self->{'rectype'} != rectype_dontrec) ? 1 : 0;
+        $self->{'will_record'} = ($self->{'rectype'} && $self->{'rectype'} != MythTV::rectype_dontrec()) ? 1 : 0;
 
     # Defaults
         $self->{'title'}       = 'Untitled'       unless ($self->{'title'} =~ /\S/);