diff --git a/moa/data/etc/config b/moa/data/etc/config
index 98f37374..84f3d166 100644
--- a/moa/data/etc/config
+++ b/moa/data/etc/config
@@ -18,7 +18,7 @@ plugins:
   system:
     moaGit:
       module: moa.plugin.system.moaGit
-      enabled: false
+      enabled: true
       enforce: false
       commit:
         - '.moa/template'
diff --git a/moa/plugin/job/openLavaActor.py b/moa/plugin/job/openLavaActor.py
index b106a916..f3d8aa64 100644
--- a/moa/plugin/job/openLavaActor.py
+++ b/moa/plugin/job/openLavaActor.py
@@ -37,8 +37,11 @@ def hook_defineCommandOptions(job, parser):
     parser.add_argument('--olx', default='', dest='openlavaExtra',
                         help='Extra arguments for bsub')
 
-    parser.add_argument('--oln', default=1, type=int, dest='openlavaProcs',
-                        help='The number of processors the jobs requires')
+    parser.add_argument('--olmin', type=int, dest='openlavaProcsMin',
+                        help='The minimum number of processors the job requires')
+                        
+    parser.add_argument('--olmax', type=int, dest='openlavaProcsMax',
+                        help='The maximum number of processors the job allows')
 
     parser.add_argument('--oldummy', default=False, dest='openlavaDummy',
                         action='store_true',
@@ -119,12 +122,16 @@ def s(*cl):
     s("#BSUB -e %s" % errfile)
     s("#BSUB -q %s" % sysConf.args.openlavaQueue)
 
-    if '--oln' in sys.argv:
-        procs = sysConf.args.openlavaProcs
-    else:
-        procs = sysConf.job.conf.get('threads', sysConf.args.openlavaProcs)
-
-    s("#BSUB -C %d" % procs)
+    # Only specify '-n' if required
+    if '--olmin' in sys.argv:
+        minProcs = sysConf.args.openlavaProcsMin
+        # Max also set?
+        if '--olmax' in sys.argv:
+            maxProcs = sysConf.args.openlavaProcsMax
+            minMaxProcs = "%d,%d" % (minProcs, maxProcs)
+        else:
+            minMaxProcs = "%d" % minProcs
+        s("#BSUB -n %s" % minMaxProcs)
 
     if sysConf.args.openlavaExtra.strip():
         s("#BSUB %s" % sysConf.args.openlavaExtra)
@@ -243,10 +250,10 @@ def s(*cl):
 #BSUB -m {{ args.openlavaHost }}
 {%- endif %}
 
-#BSUB -w '({%- for j in job.data.openlava.alljids -%}
+#BSUB -w '{%- for j in job.data.openlava.alljids -%}
 {%- if loop.index0 > 0 %}&&{% endif -%}
 done({{j}})
-{%- endfor -%})'
+{%- endfor -%}'
 cd {{ job.wd }}
 echo "Openlava OnSuccess Start"
 echo "Killing the OnError job"
@@ -265,11 +272,11 @@ def s(*cl):
 {% if args.openlavaHost -%}
 #BSUB -m {{ args.openlavaHost }}
 {%- endif %}
-#BSUB -w '({%- for j in job.data.openlava.alljids -%}
+#BSUB -w '{%- for j in job.data.openlava.alljids -%}
 {%- if loop.index0 > 0 %}||{% endif -%}
 exit({{j}},!=0)
 {%- endfor -%}
-)'
+'
 
 cd {{ job.wd }}
 echo "Openlava OnError Start"