2 files changed, 7 insertions, 4 deletions

diff --git a/dish.c b/dish.c
index 8a046f9..71180e3 100644
--- a/dish.c
+++ b/dish.c
@@ -350,6 +350,8 @@ namespace SI
            prefix = "SP";
       else if (data[0] == 0x7e)
            prefix = "EP";
+      else
+           prefix ="";
 
       programId = new char[17];
       seriesId = new char[11];
@@ -357,11 +359,11 @@ namespace SI
       sprintf(programId, "%s%08d%04d", (data[0] == 0x7e && episode == 0 ? "SH" : prefix), series, episode);
 
       if (data[0] == 0x7e)
-        sprintf(seriesId, "%s08d", prefix, series);
+        sprintf(seriesId, "%s%08d", prefix, series);
 
       if (data.TwoBytes(6) != 0 && data.TwoBytes(6) != 0x9e8b ) {
 
-          originalAirDate = (data[6] << 0x08 | data[7]) - 40587 * 86400;
+          originalAirDate = ((data[6] << 0x08 | data[7]) - 40587) * 86400;
       }
     }
 
diff --git a/eepg.c b/eepg.c
index 2d91546..0c75106 100644
--- a/eepg.c
+++ b/eepg.c
@@ -3289,13 +3289,14 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
            fmt += "\n Program ID: ";
          }
          fmt += "%s %s";
-         fmt += DishEventDescriptor->getOriginalAirDate() == 0 ? "%s" : " Original Air Date: ";
+         time_t orgAirDate = DishEventDescriptor->getOriginalAirDate();
+         fmt += orgAirDate == 0 ? "%s" : " Original Air Date: ";
          Asprintf (&tmp, fmt.c_str(), DishEventDescriptor->getDescription()
              , DishEventDescriptor->getRating()
              , DishEventDescriptor->getStarRating()
              , DishEventDescriptor->getProgramId()
              , DishEventDescriptor->getSeriesId()
-             , DishEventDescriptor->getOriginalAirDate() == 0 ? "" : ctime (&DishEventDescriptor->getOriginalAirDate()));
+             , DishEventDescriptor->getOriginalAirDate() == 0 ? "" : ctime (&orgAirDate));
          pEvent->SetDescription(tmp);
          free(tmp);