diff --git a/bob/learn/em/include/bob.learn.em/MAP_GMMTrainer.h b/bob/learn/em/include/bob.learn.em/MAP_GMMTrainer.h
index 7d30b2628355b097c76c3547eb4271f0271d5afb..7381e47d77d6bfc4f92d5f4a8e046d8f169e5492 100644
--- a/bob/learn/em/include/bob.learn.em/MAP_GMMTrainer.h
+++ b/bob/learn/em/include/bob.learn.em/MAP_GMMTrainer.h
@@ -34,7 +34,7 @@ class MAP_GMMTrainer
       const bool reynolds_adaptation=false, 
       const double relevance_factor=4, 
       const double alpha=0.5,
-      boost::shared_ptr<bob::learn::em::GMMMachine> prior_gmm = 0);
+      boost::shared_ptr<bob::learn::em::GMMMachine> prior_gmm = boost::shared_ptr<bob::learn::em::GMMMachine>());
 
     /**
      * @brief Copy constructor
diff --git a/buildout.cfg b/buildout.cfg
index be276cd9e30873b0671c777477d2826f0a951f07..914e36e6838e8f027ec3c8791115c23821cfba11 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -6,40 +6,34 @@
 parts = scripts
 eggs = bob.learn.em
 extensions = bob.buildout
-;             mr.developer
+             mr.developer
 
-;auto-checkout = *
-develop = .
-;src/bob.extension
-;          src/bob.blitz
-;          src/bob.core
-;          src/bob.io.base
-;          src/bob.sp
-;          src/bob.math
-;          src/bob.learn.activation
-;          src/bob.learn.linear
-;          src/bob.buildout
-;          .
+auto-checkout = *
+develop = src/bob.extension
+          src/bob.blitz
+          src/bob.core
+          src/bob.io.base
+          src/bob.sp
+          src/bob.math
+          src/bob.learn.activation
+          src/bob.learn.linear
+          .
 
 ; options for bob.buildout extension
 debug = true
 verbose = true
 newest = false
-prefer-final = false
 
-[environ]
-BOB_BUILD_PARALLEL = 4
-
-;[sources]
-;bob.buildout = git https://github.com/bioidiap/bob.buildout
-;bob.extension = git https://github.com/bioidiap/bob.extension
-;bob.blitz = git https://github.com/bioidiap/bob.blitz
-;bob.core = git https://github.com/bioidiap/bob.core
-;bob.io.base = git https://github.com/bioidiap/bob.io.base
-;bob.sp = git https://github.com/bioidiap/bob.sp
-;bob.math = git https://github.com/bioidiap/bob.math
-;bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
-;bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
+[sources]
+bob.extension = git https://github.com/bioidiap/bob.extension
+bob.blitz = git https://github.com/bioidiap/bob.blitz
+bob.core = git https://github.com/bioidiap/bob.core
+bob.io.base = git https://github.com/bioidiap/bob.io.base
+bob.sp = git https://github.com/bioidiap/bob.sp
+bob.math = git https://github.com/bioidiap/bob.math
+bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
+bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
 
 [scripts]
 recipe = bob.buildout:scripts
+dependent-scripts = true