diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 4f6e0f2..267e1a7 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -200,7 +200,7 @@
     Set Global Variable  ${arrayByte}   array:byte:
     @{listargs}=   Split String  ${args}
     ${index}=   Set Variable   ${0}
-    :FOR   ${word}   in   @{listargs}
+    :FOR  ${word}  IN  @{listargs}
     \    Run Keyword if   ${index} == 0   Set NetFn Byte  ${word}
     \    Run Keyword if   ${index} == 1   Set Cmd Byte    ${word}
     \    Run Keyword if   ${index} > 1    Set Array Byte  ${word}
diff --git a/lib/utils.robot b/lib/utils.robot
index 8f6db0b..f73a7a3 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -899,21 +899,21 @@
 
 Check BMC CPU Performance
     [Documentation]   Minimal 10% of proc should be free in 3 sample
-    :FOR  ${var}  IN Range  1  4
+    :FOR  ${var}  IN RANGE  1  4
     \     BMC CPU Performance check
 
 
 Check BMC Mem Performance
     [Documentation]   Minimal 10% of memory should be free
 
-    :FOR  ${var}  IN Range  1  4
+    :FOR  ${var}  IN RANGE  1  4
     \     BMC Mem Performance check
 
 
 Check BMC File System Performance
     [Documentation]  Check for file system usage for 4 times
 
-    :FOR  ${var}  IN Range  1  4
+    :FOR  ${var}  IN RANGE  1  4
     \     BMC File System Usage check
 
 
@@ -952,11 +952,10 @@
     # For a given string, look for prefix and suffix for matching expression.
     # Start of string followed by zero or more of any character followed by
     # any digit or lower case character.
-    ${resp}=  Get Matches  ${list}  regexp=^.*[0-9a-z_].${endpoint}[0-9a-z]*$
+    ${resp}=  Get Matches  ${list}  regexp=^.*[0-9a-z_].${endpoint}\[0-9a-z]*$
 
     [Return]  ${resp}
 
-
 Check Zombie Process
     [Documentation]    Check if any defunct process exist or not on BMC
     ${count}  ${stderr}  ${rc}=  Execute Command  ps -o stat | grep Z | wc -l