diff --git a/core.liberation/scripts/shared/classnames.sqf b/core.liberation/scripts/shared/classnames.sqf
index 6c2472c72..01515f6ce 100644
--- a/core.liberation/scripts/shared/classnames.sqf
+++ b/core.liberation/scripts/shared/classnames.sqf
@@ -390,13 +390,25 @@ vehicle_rearm_sources = [
 
 // Everything the AI vehicle should be able to repair from
 vehicle_repair_sources = [
+	repair_offroad,
 	repair_sling_typename,
 	repair_truck_typename,
 	"B_APC_Tracked_01_CRV_F",
 	"C_Offroad_01_repair_F",
 	"B_G_Offroad_01_repair_F",
 	"Land_RepairDepot_01_civ_F"
-];
+] + vehicle_repair_sources_west;
+
+// Everything the player can use as a Repair box
+vehicle_repair_box = [
+	repairbox_typename
+] + vehicle_repair_box_west;
+
+// Everything the AI vehicle should be able to repaint from
+vehicle_repaint_sources = [
+	repair_offroad,
+	"Land_RepairDepot_01_civ_F"
+] + vehicle_repaint_sources_west;
 
 // Everything the AI vehicle should be able to refuel from
 vehicle_refuel_sources = [
@@ -406,7 +418,7 @@ vehicle_refuel_sources = [
 	opfor_fuel_container,
 	"Land_fs_feed_F",
 	"C_Van_01_fuel_F"
-];
+] + vehicle_refuel_sources_west;
 
 // *** TRANSPORT CONFIG ***
 box_transport_config = [];
diff --git a/core.liberation/scripts/shared/default_classnames.sqf b/core.liberation/scripts/shared/default_classnames.sqf
index 929280210..4f86c96ad 100644
--- a/core.liberation/scripts/shared/default_classnames.sqf
+++ b/core.liberation/scripts/shared/default_classnames.sqf
@@ -74,9 +74,13 @@ uavs_terminal_typename = "B_UavTerminal";
 uavs_def = ["UAV_01_base_F","UAV_02_base_F","UAV_03_base_F","UAV_04_base_F","UAV_05_Base_F","UAV_06_base_F","UGV_01_base_F"];
 uavs_west = [];
 boats_west = [];
-ai_resupply_sources = [];
-ai_healing_sources = [];
-vehicle_rearm_sources = [];
+ai_healing_sources_west = [];
+ai_resupply_sources_west = [];
+vehicle_rearm_sources_west = [];
+vehicle_repair_sources_west = [];
+vehicle_repair_box_west = [];
+vehicle_repaint_sources_west = [];
+vehicle_refuel_sources_west = [];
 vehicle_big_units = [];
 GRLIB_respawn_marker = "respawn_west";
 GRLIB_music_startup = "BackgroundTrack02_F";        //"LeadTrack01a_F" (This Is War)
diff --git a/core.liberation/scripts/shared/functions/F_check_near.sqf b/core.liberation/scripts/shared/functions/F_check_near.sqf
index 21c933794..548b62c1f 100644
--- a/core.liberation/scripts/shared/functions/F_check_near.sqf
+++ b/core.liberation/scripts/shared/functions/F_check_near.sqf
@@ -16,7 +16,7 @@ if (typeName _vehicle == "OBJECT" ) then {
 	_vehpos = getPosATL _vehicle;
 };
 
-if (isNil "_list") exitWith {_ret};
+if (isNil "_list") exitWith { false };
 
 switch ( _list ) do {
 	case "LHD" : { _classlist = [lhd] };
@@ -32,9 +32,9 @@ switch ( _list ) do {
 	case "REAMMO" : { _classlist = vehicle_rearm_sources };
 	case "REAMMO_AI" : { _classlist = ai_resupply_sources };
 	case "REPAIR_AI" : { _classlist = vehicle_repair_sources };
-	case "REPAIR" : { _classlist = [repair_offroad, "Land_RepairDepot_01_civ_F"] };
-	case "REPAIR_BOX" : { _classlist = [repairbox_typename] };
-	case "REPAINT" : { _classlist = [repair_offroad, "Land_RepairDepot_01_civ_F"] };
+	case "REPAIR" : { _classlist = vehicle_repair_sources };
+	case "REPAIR_BOX" : { _classlist = vehicle_repair_box };
+	case "REPAINT" : { _classlist = vehicle_repaint_sources };
 	case "WAREHOUSE" : { _classlist = [Warehouse_typename]; _use_fast = false };
 	case "TRANSPORT" : { _classlist = transport_vehicles; _use_fast = false };
 	default { _classlist = [] };