diff --git a/fHDHR/epghandler/epgtypes/zap2it.py b/fHDHR/epghandler/epgtypes/zap2it.py
index 80eee25..2fd667f 100644
--- a/fHDHR/epghandler/epgtypes/zap2it.py
+++ b/fHDHR/epghandler/epgtypes/zap2it.py
@@ -34,7 +34,7 @@ class ZapEPG():
         programguide = {}
 
         # Start time parameter is now rounded down to nearest `zap_timespan`, in s.
-        zap_time = time.mktime(time.localtime())
+        zap_time = datetime.datetime.utcnow().timestamp()
         zap_time_window = int(self.config.dict["zap2it"]["timespan"]) * 3600
         zap_time = int(zap_time - (zap_time % zap_time_window))
 
diff --git a/fHDHR/fHDHRweb/fHDHRdevice/images.py b/fHDHR/fHDHRweb/fHDHRdevice/images.py
index dc8b211..b2eb8de 100644
--- a/fHDHR/fHDHRweb/fHDHRdevice/images.py
+++ b/fHDHR/fHDHRweb/fHDHRdevice/images.py
@@ -28,13 +28,12 @@ class imageHandler():
         return image, imagetype
 
     def get_epg_image(self, request_args):
-        imageUri = self.epghandling.get_thumbnail(request_args["type"], request_args["id"])
+        imageUri = self.epghandling.get_thumbnail(request_args["type"], str(request_args["id"]))
         if not imageUri:
-            return self.generate_image(request_args["type"], request_args["id"])
+            return self.generate_image(request_args["type"], str(request_args["id"]))
 
         req = requests.get(imageUri)
         return req.content
-        # return self.generate_image(request_args["type"], request_args["id"])
 
     def getSize(self, txt, font):
         testImg = PIL.Image.new('RGB', (1, 1))