diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl
index fcd0fbc1..6b00a7c7 100644
--- a/CommonInstall/main_omnipathwrap_delta.pl
+++ b/CommonInstall/main_omnipathwrap_delta.pl
@@ -436,7 +436,7 @@
 					  DefaultInstall => $State_Install,
 					  SrcDir => file_glob("./IntelOPA-Tools*.*"),
 					  DriverSubdir => "",
-					  PreReq => " opa_stack ", CoReq => " opa_stack ",
+					  PreReq => " opa_stack ibacm ", CoReq => " opa_stack ",
 					  Hidden => 0, Disabled => 0,
 					  HasStart => 1, HasFirmware => 0, DefaultStart => 0,
 					  StartPreReq => " opa_stack ", # TBD
diff --git a/Esm/ib/src/smi/sm/sm_qos.c b/Esm/ib/src/smi/sm/sm_qos.c
index 539f4504..8fef69a0 100644
--- a/Esm/ib/src/smi/sm/sm_qos.c
+++ b/Esm/ib/src/smi/sm/sm_qos.c
@@ -2276,11 +2276,11 @@ sm_aggregateToBfrctrl(Node_t * nodep, STL_AGGREGATE * aggr)
 	do {
 		Port_t *portp = sm_get_port(nodep, startPort + i);
 
-		if (!sm_valid_port(portp)) continue;
-
-		portp->portData->bufCtrlTable = *((STL_BUFFER_CONTROL_TABLE*)data);
-		portp->portData->current.bfrctrl = 1;
-		BSWAP_STL_BUFFER_CONTROL_TABLE(&(portp->portData->bufCtrlTable));
+		if (sm_valid_port(portp)) {
+			portp->portData->bufCtrlTable = *((STL_BUFFER_CONTROL_TABLE*)data);
+			portp->portData->current.bfrctrl = 1;
+			BSWAP_STL_BUFFER_CONTROL_TABLE(&(portp->portData->bufCtrlTable));
+		}
 		data += STL_BFRCTRLTAB_PAD_SIZE;
 	} while (++i < count);
 
diff --git a/opa-fm.spec.in b/opa-fm.spec.in
index 11404e22..f409549b 100644
--- a/opa-fm.spec.in
+++ b/opa-fm.spec.in
@@ -29,8 +29,8 @@
 
 #[ICS VERSION STRING: unknown]
 Name: opa-fm
-Version: 10.5.0.0
-Release: 136%{?dist}
+Version: 10.5.1.0
+Release: 1%{?dist}
 Summary: Intel Omni-Path Fabric Management Software
 
 License: GPLv2 or BSD