diff --git a/source/Cosmos.Build.Windows/OptionsWindow.xaml b/source/Cosmos.Build.Windows/OptionsWindow.xaml
index ae3b221c6..15a15ac69 100644
--- a/source/Cosmos.Build.Windows/OptionsWindow.xaml
+++ b/source/Cosmos.Build.Windows/OptionsWindow.xaml
@@ -33,6 +33,16 @@
                 <LineBreak/>                
                 <Span Name="spanBuildPath"></Span>
             </Paragraph>
+            <Paragraph Name="GeneralSettings">
+                <Bold>General Options</Bold>
+                <LineBreak/>
+                <InlineUIContainer>
+                    <StackPanel>
+                    <CheckBox Name="chckCompileIL" IsChecked="True">Compile IL. Do not uncheck this unless you understand the impact.</CheckBox>
+                    <CheckBox Name="chckCosmosDebugging">Include Cosmos debug code.</CheckBox>
+                        </StackPanel>
+                </InlineUIContainer>
+            </Paragraph>
             <Paragraph Name="paraQEMUOptions">
                 <Bold>QEMU Options</Bold>
             <LineBreak/>
@@ -68,13 +78,6 @@
                     </ComboBox>
                 </InlineUIContainer>
             </Paragraph>
-        <Paragraph Name="GeneralSettings">
-                <Bold>General settings</Bold>
-                <LineBreak/>
-                    <InlineUIContainer>
-                    <CheckBox Name="buildCheckBox">Skip IL compilation. Do not check this unless you understand the impact.</CheckBox>
-                </InlineUIContainer>
-        </Paragraph>
         <Paragraph TextAlignment="Right">
             <InlineUIContainer>
                 <Button Name="butnBuild" IsDefault="True">_Build</Button>
diff --git a/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs b/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
index 6a6c8d106..f1ef24e3b 100644
--- a/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
+++ b/source/Cosmos.Build.Windows/OptionsWindow.xaml.cs
@@ -144,7 +144,7 @@ namespace Cosmos.Build.Windows {
         protected void DoBuild() {
             SaveSettingsToRegistry();
 
-            if (!buildCheckBox.IsChecked.Value) {
+            if (chckCompileIL.IsChecked.Value) {
                 Console.WriteLine("Compiling...");
                 mBuilder.Compile();
             }
@@ -182,13 +182,17 @@ namespace Cosmos.Build.Windows {
                 xValue = "USB";
             }
             BuildRegistry.Write("Build Type", xValue);
-            
+
+            // General
+            BuildRegistry.Write("Compile IL", chckCompileIL.IsChecked.Value.ToString());
+            BuildRegistry.Write("Include Cosmos Debug code", chckCosmosDebugging.IsChecked.Value.ToString());
+
             // QEMU
             BuildRegistry.Write("Use GDB", chckQEMUUseGDB.IsChecked.Value.ToString());
             BuildRegistry.Write("Create HD Image", chckQEMUUseHD.IsChecked.Value.ToString());
             BuildRegistry.Write("Wait for Serial TCP", chckQEMUSerialWait.IsChecked.Value.ToString());
 
-            BuildRegistry.Write("Skip IL", buildCheckBox.IsChecked.Value.ToString());
+            // USB
             if (cmboUSBDevice.SelectedItem != null) {
                 BuildRegistry.Write("USB Device", cmboUSBDevice.Text);
             }
@@ -219,6 +223,13 @@ namespace Cosmos.Build.Windows {
 
             bool xBool;
 
+            // General
+            bool.TryParse(BuildRegistry.Read("Compile IL"), out xBool);
+            chckCompileIL.IsChecked = xBool;
+            bool.TryParse(BuildRegistry.Read("Include Cosmos Debug code"), out xBool);
+            chckCosmosDebugging.IsChecked = xBool;
+
+            // QEMU
             bool.TryParse(BuildRegistry.Read("Use GDB"), out xBool);
             chckQEMUUseGDB.IsChecked = xBool;
             bool.TryParse(BuildRegistry.Read("Create HD Image"), out xBool);
@@ -226,9 +237,7 @@ namespace Cosmos.Build.Windows {
             bool.TryParse(BuildRegistry.Read("Wait for Serial TCP"), out xBool);
             chckQEMUSerialWait.IsChecked = xBool;
 
-            bool.TryParse(BuildRegistry.Read("Skip IL"), out xBool);
-            buildCheckBox.IsChecked = xBool;
-
+            // USB
             string xUSBDevice = BuildRegistry.Read("USB Device");
             cmboUSBDevice.SelectedIndex = cmboUSBDevice.Items.IndexOf(xUSBDevice);
         }