diff --git a/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm b/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
index c62cee9f4..a390dce39 100644
--- a/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
+++ b/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
@@ -274,7 +274,7 @@ sub collectDiags {
     #TODO If file not found ("should never happen"), log error but continue
     while (<FILE>) {
         # Find record in file with NOTIFY=something on it, optionally delimited with whitespace
-        next unless ( /^[\s]*$NOTIFY_KEYWORD[\s]*$NOTIFY_KEYWORD_DELIMITER[\s]*(\S+)[\s]*$/iaa );
+        next unless ( /^[\s]*$NOTIFY_KEYWORD[\s]*$NOTIFY_KEYWORD_DELIMITER[\s]*(\S+)[\s]*$/i );
         $xcatnotify_found = 1;
         $xcatnotify = $1;  # First parenthesized expression in regex above, that is: \S+
         if ( $DEBUGGING == 1 ) {
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index ec550dbef..2b30241c5 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -69,7 +69,9 @@ Requires: conserver-xcat
 %endif
 
 #support mixed cluster
+%ifnarch s390x
 Requires: elilo-xcat xnba-undi
+%endif
 
 %ifarch i386 i586 i686 x86 x86_64
 Requires: syslinux
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index be4ebb3ac..c0a06689f 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -57,7 +57,9 @@ Requires: conserver-xcat
 %endif
 
 #support mixed cluster
+%ifnarch s390x
 Requires: elilo-xcat xnba-undi
+%endif
 
 %ifarch i386 i586 i686 x86 x86_64
 Requires: syslinux