diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index 3c9ec5a834..2f34fcd5fe 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -39,3 +39,9 @@ AddTimelock(/datum/job/command/bridge, list(
 /datum/job/command/bridge/ai
 	total_positions = 1
 	spawn_positions = 1
+
+/datum/job/command/bridge/ai/set_spawn_positions(count)
+	return spawn_positions
+
+/datum/job/command/bridge/ai/get_total_positions(latejoin = 0)
+	return latejoin ? total_positions : spawn_positions
diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm
index 0978e686b4..c8dff4a943 100644
--- a/code/game/jobs/job/marine/squad/medic.dm
+++ b/code/game/jobs/job/marine/squad/medic.dm
@@ -61,3 +61,9 @@ AddTimelock(/datum/job/marine/medic, list(
 /datum/job/marine/medic/ai
 	total_positions = 1
 	spawn_positions = 1
+
+/datum/job/marine/medic/ai/set_spawn_positions(count)
+	return spawn_positions
+
+/datum/job/marine/medic/ai/get_total_positions(latejoin=0)
+	return latejoin ? total_positions : spawn_positions
diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm
index 59ae445a0e..85ce6750fb 100644
--- a/code/game/jobs/job/marine/squad/smartgunner.dm
+++ b/code/game/jobs/job/marine/squad/smartgunner.dm
@@ -56,3 +56,9 @@ AddTimelock(/datum/job/marine/smartgunner, list(
 /datum/job/marine/smartgunner/ai
 	total_positions = 2
 	spawn_positions = 2
+
+/datum/job/marine/smartgunner/ai/set_spawn_positions(count)
+	return spawn_positions
+
+/datum/job/marine/smartgunner/ai/get_total_positions(latejoin = 0)
+	return latejoin ? total_positions : spawn_positions
diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm
index d40b50c4d5..9450b11006 100644
--- a/code/game/jobs/job/marine/squad/standard.dm
+++ b/code/game/jobs/job/marine/squad/standard.dm
@@ -40,3 +40,6 @@
 /datum/job/marine/standard/ai
 	total_positions = 4
 	spawn_positions = 4
+
+/datum/job/marine/standard/ai/set_spawn_positions(count)
+	return spawn_positions
diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
index b170684456..89da83b7c8 100644
--- a/code/modules/gear_presets/uscm.dm
+++ b/code/modules/gear_presets/uscm.dm
@@ -78,12 +78,6 @@
 
 	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
 
-/datum/equipment_preset/uscm/pfc/load_rank(mob/living/carbon/human/new_human)
-	if(new_human.client)
-		if(get_job_playtime(new_human.client, rank) < JOB_PLAYTIME_TIER_1)
-			return "ME1"
-	return paygrade
-
 /datum/equipment_preset/uscm/pfc/cryo
 	name = "USCM Cryo Squad Rifleman"
 	auto_squad_name = SQUAD_MARINE_CRYO
@@ -101,7 +95,7 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP)
 	assignment = JOB_SQUAD_SMARTGUN
 	rank = JOB_SQUAD_SMARTGUN
-	paygrade = "ME3"
+	paygrade = "ME4"
 	role_comm_title = "SG"
 	skills = /datum/skills/smartgunner
 
@@ -297,7 +291,7 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP)
 	assignment = JOB_SQUAD_TEAM_LEADER
 	rank = JOB_SQUAD_TEAM_LEADER
-	paygrade = "ME4"
+	paygrade = "ME5"
 	role_comm_title = "FTL"
 	skills = /datum/skills/tl
 
@@ -359,7 +353,7 @@
 	access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP)
 	assignment = JOB_SQUAD_LEADER
 	rank = JOB_SQUAD_LEADER
-	paygrade = "ME5"
+	paygrade = "ME7"
 	role_comm_title = "SL"
 	minimum_age = 27
 	skills = /datum/skills/SL
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index 4c383cfed6..120aded027 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -543,7 +543,7 @@
 	access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY)
 	assignment = JOB_SO
 	rank = JOB_SO
-	paygrade = "MO1"
+	paygrade = "MO2"
 	role_comm_title = "SO"
 	minimum_age = 25
 	skills = /datum/skills/SO