diff --git a/source/Cosmos.Build.Windows/Builder.cs b/source/Cosmos.Build.Windows/Builder.cs
index df797a242..e6295d6f0 100644
--- a/source/Cosmos.Build.Windows/Builder.cs
+++ b/source/Cosmos.Build.Windows/Builder.cs
@@ -141,7 +141,7 @@ namespace Cosmos.Build.Windows {
                 // Might reenable serial file later for post debugging of CPU
                 // etc since serial to TCP on a byte level is likely highly innefficient
                 // with the packet overhead
-                + " -serial tcp::4444,server"
+                + " -serial tcp::4444,server" + (aWaitSerialTCP ? "" : ",nowait")
 				+ " -serial \"file:" + BuildPath + "debug.dbg\" "
                 // Enable acceleration if we are not using GDB
                 + (aGDB ? " -S -s" : " -kernel-kqemu")
diff --git a/source/Cosmos.Build.Windows/OptionsWindow.xaml b/source/Cosmos.Build.Windows/OptionsWindow.xaml
index c7d2b3ece..f6ddb9a0f 100644
--- a/source/Cosmos.Build.Windows/OptionsWindow.xaml
+++ b/source/Cosmos.Build.Windows/OptionsWindow.xaml
@@ -37,10 +37,10 @@
                 <Bold>General Options</Bold>
                 <LineBreak/>
                 <InlineUIContainer>
-                    <StackPanel>
+                    <StackPanel HorizontalAlignment="Left">
                     <CheckBox Name="chckCompileIL" IsChecked="True">Compile IL. Do not uncheck this unless you understand the impact.</CheckBox>
                         <Label>Cosmos Debug Port</Label>
-                        <ComboBox Name="cmboDebugPort"></ComboBox>
+                        <ComboBox Name="cmboDebugPort" HorizontalAlignment="Left" Width="100"></ComboBox>
                         </StackPanel>
                 </InlineUIContainer>
             </Paragraph>
diff --git a/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs b/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
index 21420943f..d4b4acf70 100644
--- a/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
+++ b/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
@@ -92,7 +92,7 @@ namespace Cosmos.Build.Windows {
                 }
             }
 
-            cmboDebugPort.Items.Add("None");
+            cmboDebugPort.SelectedIndex = cmboDebugPort.Items.Add("None");
             cmboDebugPort.Items.Add("COM1");
             cmboDebugPort.Items.Add("COM2");
             cmboDebugPort.Items.Add("COM3");