diff --git a/MediaBrowser.ApiInteraction/BaseClient.cs b/MediaBrowser.ApiInteraction/BaseClient.cs
index bd25b1653b..887c1779fe 100644
--- a/MediaBrowser.ApiInteraction/BaseClient.cs
+++ b/MediaBrowser.ApiInteraction/BaseClient.cs
@@ -8,7 +8,23 @@ namespace MediaBrowser.ApiInteraction
     /// </summary>
     public abstract class BaseClient : IDisposable
     {
-        public string ApiUrl { get; set; }
+        /// <summary>
+        /// Gets or sets the server host name (myserver or 192.168.x.x)
+        /// </summary>
+        public string ServerHostName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the port number used by the API
+        /// </summary>
+        public int ApiPort { get; set; }
+
+        protected string ApiUrl
+        {
+            get
+            {
+                return string.Format("http://{0}:{1}/mediabrowser/api", ServerHostName, ApiPort);
+            }
+        }
 
         protected HttpClient HttpClient { get; private set; }
 
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index cc3cb76f08..3442787bcb 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -214,7 +214,7 @@ namespace MediaBrowser.Common.Kernel
         /// <summary>
         /// Reloads application configuration from the config file
         /// </summary>
-        private void ReloadConfiguration()
+        protected virtual void ReloadConfiguration()
         {
             // Deserialize config
             if (!File.Exists(ConfigurationPath))
@@ -270,7 +270,7 @@ namespace MediaBrowser.Common.Kernel
         /// <summary>
         /// Disposes all resources currently in use.
         /// </summary>
-        public void Dispose()
+        public virtual void Dispose()
         {
             DisposeHttpServer();
             DisposeLogger();