diff --git a/zone/aa.cpp b/zone/aa.cpp
index 73b2a8478..00344cbe6 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -963,40 +963,12 @@ void Client::SendPhantomStatsAlternateAdvancementRank() {
 	aai->total_prereqs = 0;
 
 	outapp->SetWritePosition(sizeof(AARankInfo_Struct));
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(0);
-	outapp->WriteSInt32(1);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(1);
-	outapp->WriteSInt32(2);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(2);
-	outapp->WriteSInt32(3);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(3);
-	outapp->WriteSInt32(4);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(4);
-	outapp->WriteSInt32(5);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(5);
-	outapp->WriteSInt32(6);
-
-	outapp->WriteSInt32(262);
-	outapp->WriteSInt32(diff);
-	outapp->WriteSInt32(6);
-	outapp->WriteSInt32(7);
+	for (int i = 0; i < 7; ++i) {
+		outapp->WriteSInt32(SE_RaiseStatCap);
+		outapp->WriteSInt32(diff);
+		outapp->WriteSInt32(0);
+		outapp->WriteSInt32(i + 1);
+	}
 
 	QueuePacket(outapp);
 	safe_delete(outapp);
diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp
index 35bac1849..df056a757 100644
--- a/zone/client_mods.cpp
+++ b/zone/client_mods.cpp
@@ -340,7 +340,7 @@ int32 Client::CalcMaxHP()
 		}
 	}
 
-	this->max_hp = std::min(max_hp, (int64)2147483647);
+	this->max_hp = std::min(max_hp, (int64)std::numeric_limits<decltype(Mob::max_hp)>::max());
 	return this->max_hp;
 }