diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index d21abb74e..167f2a84b 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -279,7 +279,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
         public string HomePageUrl
         {
-            get { return "https://emby.media"; }
+            get { return "https://github.com/jellyfin/jellyfin"; }
         }
 
         public async Task RefreshSeriesTimers(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/Emby.Server.Implementations/News/NewsEntryPoint.cs b/Emby.Server.Implementations/News/NewsEntryPoint.cs
index 3ce3d2315..38a250593 100644
--- a/Emby.Server.Implementations/News/NewsEntryPoint.cs
+++ b/Emby.Server.Implementations/News/NewsEntryPoint.cs
@@ -82,7 +82,7 @@ namespace Emby.Server.Implementations.News
 
             var requestOptions = new HttpRequestOptions
             {
-                Url = "https://emby.media/community/index.php?/blog/rss/1-media-browser-developers-blog",
+                Url = "https://github.com/jellyfin/jellyfin",
                 Progress = new SimpleProgress<double>(),
                 UserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.42 Safari/537.36",
                 BufferContent = false
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 6266e717e..37cf997c3 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -287,7 +287,7 @@ namespace MediaBrowser.Providers.Movies
             if (!string.IsNullOrEmpty(language))
             {
                 // They require this to be uppercase
-                // https://emby.media/community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148
+                // /community/index.php?/topic/32454-fr-follow-tmdbs-new-language-api-update/?p=311148
                 var parts = language.Split('-');
 
                 if (parts.Length == 2)
@@ -301,9 +301,9 @@ namespace MediaBrowser.Providers.Movies
 
         public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
         {
-            if (!string.IsNullOrEmpty(imageLanguage) 
-                && !string.IsNullOrEmpty(requestLanguage) 
-                && requestLanguage.Length > 2 
+            if (!string.IsNullOrEmpty(imageLanguage)
+                && !string.IsNullOrEmpty(requestLanguage)
+                && requestLanguage.Length > 2
                 && imageLanguage.Length == 2
                 && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 505fec65f..af9f0785f 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -353,7 +353,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                 if (!string.IsNullOrEmpty(stream.Language))
                 {
-                    // https://emby.media/community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify
+                    // /community/index.php?/topic/49071-nfo-not-generated-on-actualize-or-rescan-or-identify
                     writer.WriteElementString("language", RemoveInvalidXMLChars(stream.Language));
                 }
 
@@ -777,7 +777,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                             //Logger.Debug("Verifying custom provider tagname {0}", tagName);
                             XmlConvert.VerifyName(tagName);
                             //Logger.Debug("Saving custom provider tagname {0}", tagName);
-                            
+
                             writer.WriteElementString(GetTagForProviderKey(providerKey), providerId);
                         }
                         catch (ArgumentException)