diff --git a/lib/cli.py b/lib/cli.py
index 922ce81c9a219a9c6d0cb6675d67e8306620e515..599a59fa9bb585ed9d897833b04c48445cd54fbc 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -375,7 +375,7 @@ def AddTags(opts, args):
   if not args:
     raise errors.OpPrereqError("No tags to be added")
   op = opcodes.OpAddTags(kind=kind, name=name, tags=args)
-  SubmitOpCode(op)
+  SubmitOpCode(op, opts=opts)
 
 
 def RemoveTags(opts, args):
@@ -392,7 +392,7 @@ def RemoveTags(opts, args):
   if not args:
     raise errors.OpPrereqError("No tags to be removed")
   op = opcodes.OpDelTags(kind=kind, name=name, tags=args)
-  SubmitOpCode(op)
+  SubmitOpCode(op, opts=opts)
 
 
 def check_unit(option, opt, value): # pylint: disable-msg=W0613
diff --git a/scripts/gnt-os b/scripts/gnt-os
index d07d75ce849a5da974a6ca2d62b76f1837deb4eb..4fac7375a3a342ee9a09763507d6f0f1284af143 100755
--- a/scripts/gnt-os
+++ b/scripts/gnt-os
@@ -136,6 +136,7 @@ def _OsStatus(status, diagnose):
   else:
     return "invalid - %s" % diagnose
 
+
 def DiagnoseOS(opts, args):
   """Analyse all OSes on this cluster.