diff --git a/default.py b/default.py
index 2e1d1f46..2ab68e6f 100644
--- a/default.py
+++ b/default.py
@@ -81,17 +81,17 @@ class Main:
             
         ##### GET NEXTUP EPISODES FOR TAGNAME #####    
         elif "nextup" in mode:
-            limit = params['limit'][0]
+            limit = int(params['limit'][0])
             entrypoint.getNextUpEpisodes(id, limit)
 
         ##### GET INPROGRESS EPISODES FOR TAGNAME #####    
         elif "inprogressepisodes" in mode:
-            limit = params['limit'][0]
+            limit = int(params['limit'][0])
             entrypoint.getInProgressEpisodes(id, limit)
 
         ##### GET RECENT EPISODES FOR TAGNAME #####    
         elif "recentepisodes" in mode:
-            limit = params['limit'][0]
+            limit = int(params['limit'][0])
             entrypoint.getRecentEpisodes(id, limit)
             
         ##### GET EXTRAFANART FOR LISTITEM #####
diff --git a/resources/lib/Entrypoint.py b/resources/lib/Entrypoint.py
index 65e43b49..2d83a717 100644
--- a/resources/lib/Entrypoint.py
+++ b/resources/lib/Entrypoint.py
@@ -27,7 +27,6 @@ def doPlayback(id):
     result = DownloadUtils().downloadUrl(url)
     item = PlaybackUtils().PLAY(result, setup="default")
 
-
 #### DO RESET AUTH #####    
 def resetAuth():
     # User tried login and failed too many times
@@ -640,7 +639,6 @@ def getExtraFanArt():
     #always do endofdirectory to prevent errors in the logs
     xbmcplugin.endOfDirectory(int(sys.argv[1]))
 
-
 def addDirectoryItem(label, path, folder=True):
     li = xbmcgui.ListItem(label, path=path)
     li.setThumbnailImage("special://home/addons/plugin.video.emby/icon.png")
diff --git a/resources/lib/VideoNodes.py b/resources/lib/VideoNodes.py
index 82fba497..ce1b6b1a 100644
--- a/resources/lib/VideoNodes.py
+++ b/resources/lib/VideoNodes.py
@@ -30,7 +30,7 @@ class VideoNodes():
         
         libraryPath = xbmc.translatePath("special://profile/library/video/Emby - %s/" %tagname)
         kodiVersion = 14
-        if xbmc.getInfoLabel("System.BuildVersion").startswith("15"):
+        if xbmc.getInfoLabel("System.BuildVersion").startswith("15") or xbmc.getInfoLabel("System.BuildVersion").startswith("16"):
             kodiVersion = 15
         
         #create tag node - index