diff --git a/Assets/Rivet/Editor/UI/Dock/Dock.cs b/Assets/Rivet/Editor/UI/Dock/Dock.cs
index fad39bf..b4e9eb4 100644
--- a/Assets/Rivet/Editor/UI/Dock/Dock.cs
+++ b/Assets/Rivet/Editor/UI/Dock/Dock.cs
@@ -107,7 +107,7 @@ public void CreateGUI()
             _settingsTabButton.RegisterCallback<ClickEvent>(ev => SetTab(MainTab.Settings));
 
             // Set initial tab
-            SetTab(MainTab.Setup);
+            SetTab(MainTab.Develop);
         }
 
         public void OnEnable()
diff --git a/Assets/Rivet/Editor/UI/Dock/Dock.uxml b/Assets/Rivet/Editor/UI/Dock/Dock.uxml
index fbb0d88..f2e8a94 100644
--- a/Assets/Rivet/Editor/UI/Dock/Dock.uxml
+++ b/Assets/Rivet/Editor/UI/Dock/Dock.uxml
@@ -17,13 +17,13 @@
     </ui:VisualElement>
     <ui:VisualElement name="Screens" style="flex-grow: 1;">
         <ui:VisualElement name="TabBar" style="flex-grow: 0; flex-direction: row; flex-shrink: 0; justify-content: center; padding-top: 0; padding-bottom: 0; border-bottom-width: 1px; border-bottom-color: rgba(0, 0, 0, 0.25); padding-right: 0; padding-left: 0; height: 34px;">
-            <ui:Instance template="TabBarButton" name="Setup" class="active" style="flex-grow: 1;">
+            <ui:Instance template="TabBarButton" name="Setup" class="active" style="flex-grow: 1; display: none;">
                 <AttributeOverrides element-name="Label" text="Setup" />
             </ui:Instance>
             <ui:Instance template="TabBarButton" name="Develop" style="flex-grow: 1;">
                 <AttributeOverrides element-name="Label" text="Develop" />
             </ui:Instance>
-            <ui:Instance template="TabBarButton" name="Modules" style="flex-grow: 1;">
+            <ui:Instance template="TabBarButton" name="Modules" style="flex-grow: 1; display: none;">
                 <AttributeOverrides element-name="Label" text="Modules" />
             </ui:Instance>
             <ui:Instance template="TabBarButton" name="Settings" style="flex-grow: 1;">
diff --git a/Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs b/Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs
index 4aec766..80a6068 100644
--- a/Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs
+++ b/Assets/Rivet/Editor/UI/TaskPanel/TaskPanelWindow.cs
@@ -2,6 +2,8 @@
 using UnityEngine;
 using UnityEngine.UIElements;
 using Rivet.Editor.UI.Dock;
+using System.Runtime.InteropServices;
+using System;
 
 namespace Rivet.Editor.UI.TaskPanel
 {
@@ -55,15 +57,16 @@ public void CreateGUI()
 
         public void UpdateLogs()
         {
-            // In case the singleton doesn't exist yet
-            if (TaskManager != null)
+            if (TaskManager != null && _logListView != null)
             {
+                // Add logs
                 _logListView.itemsSource = TaskManager.LogEntries;
+
+                // Rebuild view
+                _logListView.Rebuild();
+                _logListView.ScrollToItem(-1);
             }
 
-            // Rebuild view
-            _logListView.Rebuild();
-            _logListView.ScrollToItem(-1);
         }
 
         private void OnClearPressed()
diff --git a/Assets/Rivet/Editor/Util/Builder.cs b/Assets/Rivet/Editor/Util/Builder.cs
index 56ef60e..5b5e7fa 100644
--- a/Assets/Rivet/Editor/Util/Builder.cs
+++ b/Assets/Rivet/Editor/Util/Builder.cs
@@ -148,8 +148,6 @@ public static string BuildDevDedicatedServer()
                 subtarget = (int)StandaloneBuildSubtarget.Server
             };
 
-            return FindServerExecutablePath(buildPlayerOptions.locationPathName, buildPlayerOptions.target);
-
             // Build the server
             RivetLogger.Log("Building dedicated server...");
             var report = BuildPipeline.BuildPlayer(buildPlayerOptions);