diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 6e40f6d8bd45ef5d161e9648c03fdbdc165283e6..1b397dbbd7d591a4d8177f9e8d83d685a46af6f7 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -127,8 +127,7 @@ def ShowClusterMaster(opts, args):
     opts - class with options as members
 
   """
-  sstore = ssconf.SimpleStore()
-  print sstore.GetMasterNode()
+  print GetClient().QueryConfigValues(["master_node"])[0]
   return 0
 
 
@@ -172,6 +171,8 @@ def ClusterCopyFile(opts, args):
 
   op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
   results = [row[0] for row in SubmitOpCode(op) if row[0] != myname]
+
+  # TODO: Potential inconsistency between local node and master
   srun = ssh.SshRunner(cfg)
   for node in results:
     if not srun.CopyFileToNode(node, filename):
@@ -198,8 +199,8 @@ def RunClusterCommand(opts, args):
   op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
   nodes = [row[0] for row in SubmitOpCode(op)]
 
-  sstore = ssconf.SimpleStore()
-  master_node = sstore.GetMasterNode()
+  # TODO: Potential inconsistency between local node and master
+  master_node = cfg.GetMasterNode()
   srun = ssh.SshRunner(cfg)
 
   # Make sure master node is at list end