diff --git a/src/simulator/high-precision-128.h b/src/simulator/high-precision-128.h
index 8ede96ec8..775f59ea0 100644
--- a/src/simulator/high-precision-128.h
+++ b/src/simulator/high-precision-128.h
@@ -222,7 +222,9 @@ HighPrecision::Compare (HighPrecision const &o) const
       HP128INC (m_nslowcmps);
       return SlowCompare (o);
     }
-
+  // The below statement is unreachable but necessary for optimized
+  // builds with gcc-4.0.x due to a compiler bug.
+  return 0;  
 }
 HighPrecision 
 HighPrecision::Zero (void)
diff --git a/src/wscript b/src/wscript
index aa57364be..ad3a80d59 100644
--- a/src/wscript
+++ b/src/wscript
@@ -47,11 +47,18 @@ def configure(conf):
     ## Used to link the 'run-tests' program with all of ns-3 code
     conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]
 
-
+def create_ns3_module(bld, name, dependencies=()):
+    module = bld.create_obj('cpp', 'shlib')
+    module.name = 'ns3-' + name
+    module.target = module.name
+    module.uselib_local = ['ns3-' + dep for dep in dependencies]
+    return module
+    
 
 def build(bld):
     Object.register('ns3header', Ns3Header)
     Action.Action('ns3header', func=_ns3_headers_inst, color='BLUE')
+    bld.create_ns3_module = create_ns3_module
     
     bld.add_subdirs(list(all_modules))
 
diff --git a/wscript b/wscript
index e91740cbe..2241433dd 100644
--- a/wscript
+++ b/wscript
@@ -144,6 +144,10 @@ def build(bld):
         run_shell()
         raise SystemExit(0)
 
+    if Params.g_options.doxygen:
+        doxygen()
+        raise SystemExit(0)
+
     check_shell()
 
     # process subfolders from here
@@ -166,9 +170,6 @@ def shutdown():
     if Params.g_options.lcov_report:
         lcov_report()
 
-    if Params.g_options.doxygen:
-        doxygen()
-
     if Params.g_options.run:
         run_program(Params.g_options.run, Params.g_options.command_template)
         raise SystemExit(0)