diff --git a/resources/lib/modules/menu.py b/resources/lib/modules/menu.py
index d6575fb..3c48454 100644
--- a/resources/lib/modules/menu.py
+++ b/resources/lib/modules/menu.py
@@ -91,7 +91,7 @@ class Menu:
                 title = item.title
 
             return TitleItem(title=title,
-                             path=kodiutils.url_for('show_catalog_program', channel=item.channel, program=item.path),
+                             path=kodiutils.url_for('show_catalog_program', program=item.path),
                              art_dict=art_dict,
                              info_dict=info_dict)
 
@@ -119,7 +119,7 @@ class Menu:
                     from urllib import quote
 
                 # We don't have an UUID, and first need to fetch the video information from the page
-                path = kodiutils.url_for('play_from_page', channel=item.channel, page=quote(item.path, safe=''))
+                path = kodiutils.url_for('play_from_page', page=quote(item.path, safe=''))
             else:
                 # We have an UUID and can play this item directly
                 # This is not preferred since we will lack metadata
diff --git a/resources/lib/viervijfzes/epg.py b/resources/lib/viervijfzes/epg.py
index 967d4f7..7153438 100644
--- a/resources/lib/viervijfzes/epg.py
+++ b/resources/lib/viervijfzes/epg.py
@@ -166,7 +166,7 @@ class EpgApi:
 
         # Find a matching broadcast
         for broadcast in programs:
-            if timestamp <= broadcast.start < (broadcast.start + timedelta(seconds=broadcast.duration)):
+            if broadcast.start <= timestamp < (broadcast.start + timedelta(seconds=broadcast.duration)):
                 return broadcast
 
         return None