diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb
index 7915c32df4..dd306a69d2 100644
--- a/src/sunstone/models/SunstoneServer.rb
+++ b/src/sunstone/models/SunstoneServer.rb
@@ -225,7 +225,7 @@ class SunstoneServer
         vnc_port = resource['TEMPLATE/GRAPHICS/PORT']
 
         # The noVNC proxy_port
-        proxy_port = config[:vnc_proxy_base_port] + vnc_port.to_i
+        proxy_port = config[:vnc_proxy_base_port].to_i + vnc_port.to_i
 
         begin
             novnc_cmd = "#{config[:novnc_path]}/utils/launch.sh"
diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb
index cfd313980a..b614b24bfa 100755
--- a/src/sunstone/sunstone-server.rb
+++ b/src/sunstone/sunstone-server.rb
@@ -42,14 +42,14 @@ require 'sinatra'
 require 'cloud/Configuration'
 require 'SunstoneServer'
 
-@config = Configuration.new(CONFIGURATION_FILE)
+set :config, Configuration.new(CONFIGURATION_FILE)
 
 ##############################################################################
 # Sinatra Configuration
 ##############################################################################
 use Rack::Session::Pool
-set :host, @config[:host]
-set :port, @config[:port]
+set :host, settings.config[:host]
+set :port, settings.config[:port]
 
 ##############################################################################
 # Helpers
@@ -221,7 +221,7 @@ post '/vm/:id/startvnc' do
         return [200, info.to_json]
     end
 
-    rc = @SunstoneServer.startvnc(vm_id, @config)
+    rc = @SunstoneServer.startvnc(vm_id, settings.config)
     if rc[0] == 200
         info = rc[1]
         session['vnc'][vm_id] = info.clone