diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 4c20ce0faf01b299741186f85aed3c58a16c1473..8b1aa6334f15c55148b662faa1efcce2ce77c7d5 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3072,9 +3072,9 @@ class LUCreateInstance(LogicalUnit):
     pnode_name = self.pnode.name
 
     if self.op.mac == "auto":
-      mac_address=self.cfg.GenerateMAC()
+      mac_address = self.cfg.GenerateMAC()
     else:
-      mac_address=self.op.mac
+      mac_address = self.op.mac
 
     nic = objects.NIC(bridge=self.op.bridge, mac=mac_address)
     if self.inst_ip is not None:
@@ -4160,7 +4160,7 @@ class LUSetInstanceParms(LogicalUnit):
 
       if self.kernel_path != constants.VALUE_DEFAULT:
         if not os.path.isabs(self.kernel_path):
-          raise errors.OpPrereError("The kernel path must be an absolute"
+          raise errors.OpPrereqError("The kernel path must be an absolute"
                                     " filename")
     else:
       self.do_kernel_path = False
@@ -4170,7 +4170,7 @@ class LUSetInstanceParms(LogicalUnit):
       if self.initrd_path not in (constants.VALUE_NONE,
                                   constants.VALUE_DEFAULT):
         if not os.path.isabs(self.kernel_path):
-          raise errors.OpPrereError("The initrd path must be an absolute"
+          raise errors.OpPrereqError("The initrd path must be an absolute"
                                     " filename")
     else:
       self.do_initrd_path = False