diff --git a/contrib/other-builds/all.workspace b/contrib/other-builds/all.workspace
index 7b1d7862b5..03a39c4fdd 100644
--- a/contrib/other-builds/all.workspace
+++ b/contrib/other-builds/all.workspace
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="all" Database="all.tags">
-  <Project Name="manual-label" Path="manual-label/manual-label.project" Active="No"/>
+  <Project Name="manual-label" Path="manual-label/manual-label.project" Active="Yes"/>
   <Project Name="extract" Path="extract/extract.project" Active="No"/>
   <Project Name="util" Path="util/util.project" Active="No"/>
   <Project Name="extract-mixed-syntax" Path="extract-mixed-syntax/extract-mixed-syntax.project" Active="No"/>
   <Project Name="lm" Path="lm/lm.project" Active="No"/>
   <Project Name="OnDiskPt" Path="OnDiskPt/OnDiskPt.project" Active="No"/>
   <Project Name="search" Path="search/search.project" Active="No"/>
-  <Project Name="moses" Path="moses/moses.project" Active="Yes"/>
+  <Project Name="moses" Path="moses/moses.project" Active="No"/>
   <Project Name="moses-cmd" Path="moses-cmd/moses-cmd.project" Active="No"/>
   <Project Name="score" Path="score/score.project" Active="No"/>
   <Project Name="consolidate" Path="consolidate/consolidate.project" Active="No"/>
diff --git a/scripts/training/wrappers/madamira-wrapper.perl b/scripts/training/wrappers/madamira-wrapper.perl
index 5c1d0404f0..1e6b632253 100755
--- a/scripts/training/wrappers/madamira-wrapper.perl
+++ b/scripts/training/wrappers/madamira-wrapper.perl
@@ -12,7 +12,6 @@
 
 
 my $TMPDIR = "tmp";
-my $SCHEME = "D2";
 my $KEEP_TMP = 0;
 my $MADA_DIR;
 my $CONFIG;
@@ -21,7 +20,6 @@
 my @FACTORS;
 
 GetOptions(
-  "scheme=s" => \$SCHEME,
   "tmpdir=s" => \$TMPDIR,
   "keep-tmp" => \$KEEP_TMP,
   "mada-dir=s" => \$MADA_DIR,