diff --git a/MediaBrowser.Api/UserLibrary/ArtistsService.cs b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
index 121d395ba..dd9825deb 100644
--- a/MediaBrowser.Api/UserLibrary/ArtistsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ArtistsService.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Querying;
 using ServiceStack;
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 1f82e7ef1..64e5d20c9 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -886,7 +886,14 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (type == typeof(Person))
             {
-                subFolderPrefix = validFilename.Substring(0, 1);
+                var subFolderIndex = 0;
+
+                while (!char.IsLetterOrDigit(validFilename[subFolderIndex]))
+                {
+                    subFolderIndex++;
+                }
+
+                subFolderPrefix = validFilename.Substring(subFolderIndex, 1);
             }
 
             var fullPath = string.IsNullOrEmpty(subFolderPrefix) ?
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index 19aaaf8a5..f51998fea 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -233,8 +233,6 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private Task SendMessageInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
         {
-            if (SkipSending()) return Task.FromResult(true);
-
             var socket = GetActiveSocket();
 
             return socket.SendAsync(message, cancellationToken);
@@ -242,8 +240,6 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private Task SendMessagesInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
         {
-            if (SkipSending()) return Task.FromResult(true);
-
             var tasks = GetActiveSockets().Select(i => Task.Run(async () =>
             {
                 try
@@ -260,27 +256,6 @@ namespace MediaBrowser.Server.Implementations.Session
             return Task.WhenAll(tasks);
         }
 
-        private bool SkipSending()
-        {
-            if (Session != null)
-            {
-                if (string.Equals(Session.Client, "mb-classic", StringComparison.OrdinalIgnoreCase))
-                {
-                    Version version;
-
-                    if (!string.IsNullOrWhiteSpace(Session.ApplicationVersion) && Version.TryParse(Session.ApplicationVersion, out version))
-                    {
-                        if (version < new Version(3, 0, 196))
-                        {
-                            _logger.Debug("Skipping web socket message to MBC version {0}.", version);
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        }
-
         public void Dispose()
         {
             foreach (var socket in Sockets.ToList())
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 851d73ed7..3f8cacbfa 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5557.0")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5557.0")]