diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 4d3ff16f99..9fb4bdb9b7 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -113,10 +113,7 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
         std::unique_ptr<ServerInterface> serverInterface =
             ServerInterface::createFromDictionary(interfaceDictionary);
 
-
-        //if (global::windowDelegate->isMaster()) {
-            serverInterface->initialize();
-        //}
+        serverInterface->initialize();
 
         _interfaceOwner.addPropertySubOwner(serverInterface.get());
 
@@ -132,10 +129,6 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
 }
 
 void ServerModule::preSync() {
-    //if (!global::windowDelegate->isMaster()) {
-    //    return;
-    //}
-
     // Set up new connections.
     for (std::unique_ptr<ServerInterface>& serverInterface : _interfaces) {
         if (!serverInterface->isEnabled()) {
@@ -204,9 +197,7 @@ void ServerModule::disconnectAll() {
     ZoneScoped
 
     for (std::unique_ptr<ServerInterface>& serverInterface : _interfaces) {
-        //if (global::windowDelegate->isMaster()) {
-            serverInterface->deinitialize();
-        //}
+        serverInterface->deinitialize();
     }
 
     for (ConnectionData& connectionData : _connections) {
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 7a5200540b..ab95670563 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -41,6 +41,7 @@ namespace {
 
 
     bool browserBelongsToCurrentNode(std::string identifier) {
+        // Convert the last char to an int
         int nodeId = static_cast<int>(identifier[identifier.length() - 1] - '0');
         return nodeId == openspace::global::windowDelegate->currentNode();
     }