diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index 7d1a6dce..16d22e23 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -163,9 +163,9 @@ class KodiMonitor(xbmc.Monitor):
             item_id = self._get_item_id(kodi_id, item_type)
             if item_id:
                 # Stop from manually marking as watched unwatched, with actual playback.
-                if window('emby_skipWatched%s' % item_id) == "true":
+                if window('emby.skip.%s' % item_id) == "true":
                     # property is set in player.py
-                    window('emby_skipWatched%s' % item_id, clear=True)
+                    window('emby.skip.%s' % item_id, clear=True)
                 else:
                     # notify the server
                     url = "{server}/emby/Users/{UserId}/PlayedItems/%s?format=json" % item_id
diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py
index a3246fec..8f544421 100644
--- a/resources/lib/playbackutils.py
+++ b/resources/lib/playbackutils.py
@@ -160,6 +160,8 @@ class PlaybackUtils(object):
 
                     self.stack.append([url, listitem])
 
+                window('emby.skip.%s' % self.item['Id'], value="true")
+
     def _set_additional_parts(self, item_id):
 
         parts = self.emby.get_additional_parts(item_id)
@@ -211,6 +213,9 @@ class PlaybackUtils(object):
         elif mediatype == "Audio":
             metadata['mediatype'] = "song"
 
+        else:
+            metadata['mediatype'] = "video"
+
         if dbid:
             metadata['dbid'] = dbid
         else:
@@ -219,7 +224,7 @@ class PlaybackUtils(object):
         listitem.setProperty('IsPlayable', 'true')
         listitem.setProperty('IsFolder', 'false')
         listitem.setLabel(metadata['title'])
-        listitem.setInfo('Music' if mediatype == "Audio" else 'Video', infoLabels=metadata)
+        listitem.setInfo('music' if mediatype == "Audio" else 'video', infoLabels=metadata)
 
     def set_properties(self, url, listitem):
 
diff --git a/resources/lib/player.py b/resources/lib/player.py
index 550080fb..8dfc71ea 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -136,7 +136,6 @@ class Player(xbmc.Player):
 
             #self.set_audio_subs(item.get('forcedaudio'), item.get('forcedsubs'))
 
-            window('emby_skipWatched%s' % item_id, value="true")
             customseek = window('emby_customPlaylist.seektime')
             if window('emby_customPlaylist') == "true" and customseek:
                 # Start at, when using custom playlist (play to Kodi from webclient)
@@ -457,7 +456,7 @@ class Player(xbmc.Player):
                 playMethod = data['playmethod']
 
                 # Prevent manually mark as watched in Kodi monitor
-                window('emby_skipWatched%s' % itemid, value="true")
+                window('emby.skip.%s' % itemid, value="true")
 
                 self.stopPlayback(data)