diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index e68d05e9..33d65f09 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -237,8 +237,8 @@
     <string id="30246">Enable Netflix style next up notification</string>
     <string id="30247">  - The number of seconds before the end to show the notification</string>
     <string id="30248">Show Emby Info dialog on play/select action</string>
-    <string id="30249">Suppress server connection message at boot</string>
-    <string id="30250">Use local paths instead of addon redirect (faster playback, but no remote access)</string>
+    <string id="30249">Suppress server connection message on start-up</string>
+    <string id="30250">Use local paths instead of addon redirect for playback</string>
     
     
 	<!-- Default views -->
diff --git a/resources/lib/LibrarySync.py b/resources/lib/LibrarySync.py
index 66ff97b5..02a2dea8 100644
--- a/resources/lib/LibrarySync.py
+++ b/resources/lib/LibrarySync.py
@@ -522,7 +522,7 @@ class LibrarySync():
             WINDOW.setProperty("SyncDatabaseRunning", "true")
             
             #show the progress dialog
-            if (dbSyncIndication):
+            if (dbSyncIndication and xbmc.Player().isPlaying() == False):
                 xbmcgui.Dialog().notification('Emby for Kodi', 'Performing incremental sync...', "special://home/addons/plugin.video.emby/icon.png")
             
             connection = utils.KodiSQL("video")
diff --git a/resources/settings.xml b/resources/settings.xml
index eff532dd..c7008982 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -8,9 +8,7 @@
 		<setting id="https" type="bool" label="30243" visible="true" enable="true" default="false" />
 		<setting id="sslverify" type="bool" label="Verify Host SSL Certificate" visible="eq(-1,true)" enable="true" default="false" />
 		<setting id="sslcert" type="file" label="Client SSL certificate" visible="eq(-2,true)" enable="true" default="None" />
-		<setting type="sep" />
 		<setting id="deviceName" type="text" label="30016" default="Kodi" />
-		<setting type="sep" />
 		<setting id="accessToken" type="text" visible="false" default="" />
 		<setting label="[COLOR yellow]Reset login attempts[/COLOR]" type="action" visible="eq(-1,) + !eq(-9,)" enable="true" action="RunPlugin(plugin://plugin.video.emby?mode=resetauth)" option="close" />
 	</category>
@@ -23,10 +21,8 @@
 	<category label="Playback"> <!-- Extra Sync options -->
 		<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />
 		<setting id="smbpassword" type="text" label="30008" default="" option="hidden" visible="true" enable="true" />
-	    <setting type="sep"/>
-	    <setting type="sep" />	    
-        <setting id="offerDelete" type="bool" label="30127" visible="true" enable="true" default="false" />
 		<setting type="sep" />
+        <setting id="offerDelete" type="bool" label="30127" visible="true" enable="true" default="false" />
 	    <setting id="playFromStream" type="bool" label="30002" visible="true" enable="true" default="false" />
 	    <setting id="videoBitRate" type="enum" label="30160" values="664 Kbps SD|996 Kbps HD|1.3 Mbps HD|2.0 Mbps HD|3.2 Mbps HD|4.7 Mbps HD|6.2 Mbps HD|7.7 Mbps HD|9.2 Mbps HD|10.7 Mbps HD|12.2 Mbps HD|13.7 Mbps HD|15.2 Mbps HD|16.7 Mbps HD|18.2 Mbps HD|20.0 Mbps HD|40.0 Mbps HD|100.0 Mbps HD [default]|1000.0 Mbps HD" visible="eq(-1,true)" default="17" />
 		<setting id="forceTranscodingCodecs" type="text" label="30245" visible="false" />