diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 1a57d3bd80068d5cad3f0be939f516a613d428b4..6eb4446c45369cac88acf4e9f489823646c1d112 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2006, 2007, 2008 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -641,7 +641,7 @@ def IsRapiResponding(hostname):
   @return: Whether RAPI is working properly
 
   """
-  curl_config = rapi.client.GenericCurlConfig(cafile=constants.RAPI_CERT_FILE)
+  curl_config = rapi.client.GenericCurlConfig()
   rapi_client = rapi.client.GanetiRapiClient(hostname,
                                              curl_config_fn=curl_config)
   try:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index db43e690c5f939eeb35d620a575f943fa9e48073..b45389309e8643b9433e53ae7cb297216eda1126 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6536,7 +6536,6 @@ class LUCreateInstance(LogicalUnit):
     ("identify_defaults", False, _TBool),
     ("file_driver", None, _TOr(_TNone, _TElemOf(constants.FILE_DRIVER))),
     ("file_storage_dir", None, _TMaybeString),
-    ("dry_run", False, _TBool),
     ]
   REQ_BGL = False
 
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 0bd9c353c641eaa73adb0d33952fc946b413209d..34ed717f2a84e374b61120e28bf153e2b83e0e25 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -480,7 +480,6 @@ class OpCreateInstance(OpCode):
     "source_handshake",
     "source_x509_ca",
     "source_instance_name",
-    "dry_run",
     ]
 
 
diff --git a/tools/move-instance b/tools/move-instance
index 1e3d494b189faed3853348e30121b84d04054a7e..f007431363cec2f4d72cb4ea0c2d65dc75357453 100755
--- a/tools/move-instance
+++ b/tools/move-instance
@@ -437,7 +437,7 @@ class MoveDestExecutor(object):
       mrt.dest_to_source.release()
 
   @staticmethod
-  def _CreateInstance(cl, name, snode, pnode, iallocator, instance, expinfo):
+  def _CreateInstance(cl, name, pnode, snode, iallocator, instance, expinfo):
     """Starts the instance creation in remote import mode.
 
     @type cl: L{rapi.client.GanetiRapiClient}