diff --git a/common/OpTestBMC.py b/common/OpTestBMC.py
index 8fef324dc..0859834ce 100644
--- a/common/OpTestBMC.py
+++ b/common/OpTestBMC.py
@@ -169,7 +169,7 @@ def reboot(self):
     def pnor_img_transfer(self,i_imageDir,i_imageName):
 
         pnor_path = i_imageDir + i_imageName
-        rsync_cmd = 'rsync -v -e "ssh -k" %s %s@%s:/tmp' % (pnor_path,
+        rsync_cmd = 'rsync -v -e "ssh -k -o StrictHostKeyChecking=no" %s %s@%s:/tmp' % (pnor_path,
                                                             self.cv_bmcUser,
                                                             self.cv_bmcIP)
 
diff --git a/common/OpTestIPMI.py b/common/OpTestIPMI.py
index 0364ff5c4..a7c2962f5 100644
--- a/common/OpTestIPMI.py
+++ b/common/OpTestIPMI.py
@@ -484,8 +484,7 @@ def ipmi_wait_for_os_boot_complete_v1(self, i_timeout=10):
     #
     # @return BMC_CONST.FW_SUCCESS or raise OpTestError
     #
-    def ipmi_sel_check(self,i_string):
-        selDesc = 'Transition to Non-recoverable'
+    def ipmi_sel_check(self, i_string="Transition to Non-recoverable"):
         logFile = self.cv_ffdcDir + '/' + 'host_sel_elist.log'
         output = self.ipmitool.run('sel elist')
 
diff --git a/common/OpTestSystem.py b/common/OpTestSystem.py
index 64962e317..aa79a47ed 100755
--- a/common/OpTestSystem.py
+++ b/common/OpTestSystem.py
@@ -464,7 +464,7 @@ def sys_wait_for_os_boot_complete(self, i_timeout=10):
     #
     # @return BMC_CONST.FW_SUCCESS or BMC_CONST.FW_FAILED
     #
-    def sys_sel_check(self,i_string):
+    def sys_sel_check(self,i_string="Transition to Non-recoverable"):
         try:
             rc = self.cv_IPMI.ipmi_sel_check(i_string)
         except OpTestError as e:
@@ -1232,10 +1232,10 @@ def exit_petitboot_shell(self):
         console.sendline('exit')
         self.wait_for_petitboot()
 
-    def wait_for_login(self):
+    def wait_for_login(self, timeout=600):
         console = self.console.get_console()
         console.sendline('')
-        console.expect('login: ')
+        console.expect('login: ', timeout)
 
 
 class OpTestFSPSystem(OpTestSystem):