diff --git a/Jenkinsfile b/Jenkinsfile
index 88aadf7..009bf16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,7 +50,7 @@ node {
 
 		packageAndArchive(buildMode, "torch-server", "Torch.Client*")
 
-		packageAndArchive(buildMode, "torch-client", "Torch.Server*")
+		/*packageAndArchive(buildMode, "torch-client", "Torch.Server*")*/
 	}
 
 	/* Disabled because they fail builds more often than they detect actual problems
@@ -73,4 +73,4 @@ node {
 	    ])
 	}
 	*/
-}
\ No newline at end of file
+}
diff --git a/Torch.Server/Views/ConfigControl.xaml b/Torch.Server/Views/ConfigControl.xaml
index 0f4462e..43ac44e 100644
--- a/Torch.Server/Views/ConfigControl.xaml
+++ b/Torch.Server/Views/ConfigControl.xaml
@@ -26,8 +26,8 @@
         </Grid.RowDefinitions>
         <DockPanel Grid.Row="0">
             <Label Content="World:" DockPanel.Dock="Left" />
-            <Button Content="Import World Config" Margin="3" DockPanel.Dock="Right" Click="ImportConfig_OnClick" ToolTip="Override the DS config with the one from the selected world."/>
-            <ComboBox ItemsSource="{Binding Worlds}" SelectedItem="{Binding SelectedWorld}" Margin="3"
+            <Button Content="Import World Config" Margin="3" DockPanel.Dock="Right" Click="ImportConfig_OnClick" ToolTip="Override the DS config with the one from the selected world." IsEnabled="{Binding ElementName=WorldList, Path=Items.Count, Mode=OneWay}"/>
+            <ComboBox x:Name="WorldList" ItemsSource="{Binding Worlds}" SelectedItem="{Binding SelectedWorld}" Margin="3"
                       SelectionChanged="Selector_OnSelectionChanged">
                 <ComboBox.ItemTemplate>
                     <DataTemplate DataType="managers:WorldViewModel">