diff --git a/default.py b/default.py
index f8401cc0..6cd8df06 100644
--- a/default.py
+++ b/default.py
@@ -37,7 +37,7 @@ class Main:
         xbmc.log("Parameter string: %s" % sys.argv[2])
         try:
             mode = params['mode'][0]
-            itemid = params.get('id')
+            itemid = params.get('id', '')
             if itemid:
                 try:
                     itemid = itemid[0]
@@ -46,8 +46,6 @@ class Main:
         except:
             params = {}
             mode = ""
-        xbmc.log("mode: %s, itemid: %s, base_url: %s, addon_handle: %s"
-                 % (mode, itemid, base_url, addon_handle), 2)
 
         modes = {
 
diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py
index afe21f6d..5a878b58 100644
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@@ -108,19 +108,19 @@ def doMainListing():
                 addDirectoryItem(label, path)
 
     #experimental live tv nodes
-    addDirectoryItem("Live Tv Channels (experimental)", "plugin://plugin.video.emby/?mode=browsecontent&type=tvchannels&folderid=root")
-    addDirectoryItem("Live Tv Recordings (experimental)", "plugin://plugin.video.emby/?mode=browsecontent&type=recordings&folderid=root")
+    addDirectoryItem("Live Tv Channels (experimental)", "plugin://plugin.video.plexkodiconnect/?mode=browsecontent&type=tvchannels&folderid=root")
+    addDirectoryItem("Live Tv Recordings (experimental)", "plugin://plugin.video.plexkodiconnect/?mode=browsecontent&type=recordings&folderid=root")
 
     # some extra entries for settings and stuff. TODO --> localize the labels
-    addDirectoryItem("Network credentials", "plugin://plugin.video.emby/?mode=passwords")
-    addDirectoryItem("Settings", "plugin://plugin.video.emby/?mode=settings")
-    addDirectoryItem("Add user to session", "plugin://plugin.video.emby/?mode=adduser")
-    addDirectoryItem("Refresh Emby playlists", "plugin://plugin.video.emby/?mode=refreshplaylist")
-    addDirectoryItem("Perform manual sync", "plugin://plugin.video.emby/?mode=manualsync")
-    addDirectoryItem("Repair local database (force update all content)", "plugin://plugin.video.emby/?mode=repair")
-    addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.emby/?mode=reset")
-    addDirectoryItem("Cache all images to Kodi texture cache", "plugin://plugin.video.emby/?mode=texturecache")
-    addDirectoryItem("Sync Emby Theme Media to Kodi", "plugin://plugin.video.emby/?mode=thememedia")
+    addDirectoryItem("Network credentials", "plugin://plugin.video.plexkodiconnect/?mode=passwords")
+    addDirectoryItem("Settings", "plugin://plugin.video.plexkodiconnect/?mode=settings")
+    addDirectoryItem("Add user to session", "plugin://plugin.video.plexkodiconnect/?mode=adduser")
+    addDirectoryItem("Refresh Emby playlists", "plugin://plugin.video.plexkodiconnect/?mode=refreshplaylist")
+    addDirectoryItem("Perform manual sync", "plugin://plugin.video.plexkodiconnect/?mode=manualsync")
+    addDirectoryItem("Repair local database (force update all content)", "plugin://plugin.video.plexkodiconnect/?mode=repair")
+    addDirectoryItem("Perform local database reset (full resync)", "plugin://plugin.video.plexkodiconnect/?mode=reset")
+    addDirectoryItem("Cache all images to Kodi texture cache", "plugin://plugin.video.plexkodiconnect/?mode=texturecache")
+    addDirectoryItem("Sync Emby Theme Media to Kodi", "plugin://plugin.video.plexkodiconnect/?mode=thememedia")
     
     xbmcplugin.endOfDirectory(int(sys.argv[1]))
 
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index 04e4f1b3..100cbccc 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -396,9 +396,6 @@ class LibrarySync(threading.Thread):
                 self.logMsg(
                     "SyncDatabase (finished %s in: %s)"
                     % (itemtype, str(elapsedTime).split('.')[0]), 1)
-        else:
-            # Close the Kodi cursor
-            kodicursor.close()
 
         # # sync music
         # if music_enabled:
diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py
index 90fa9aca..041b5ed0 100644
--- a/resources/lib/playutils.py
+++ b/resources/lib/playutils.py
@@ -37,7 +37,7 @@ class PlayUtils():
     
 
     def getPlayUrl(self, child=0, partIndex=None):
-
+        item = self.item
         # NO, I am not very fond of this construct!
         self.API.setChildNumber(child)
         if partIndex is not None: