diff --git a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf b/Sources/epoch_code/compile/EPOCH_consumeItem.sqf
index e65e3103..3ad0b948 100644
--- a/Sources/epoch_code/compile/EPOCH_consumeItem.sqf
+++ b/Sources/epoch_code/compile/EPOCH_consumeItem.sqf
@@ -149,6 +149,9 @@ switch _interactOption do {
 		};
 	};
 	case 4: { // Refuel 4
+		if !(player == vehicle player) exitwith {
+			["Fill from outside!", 5] call Epoch_message;
+		};
 		_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
 		if (cursorTarget in _vehicles) then {
 			_vehicle = cursorTarget;
diff --git a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf
index 7005e233..a563452d 100644
--- a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf
+++ b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf
@@ -29,7 +29,7 @@ _storedVehicleLimit = [_serverSettingsConfig, "storedVehicleLimit", 20] call EPO
 
 EPOCH_storedVehicleCount = 0;
 
-for "_i" from 1 to _maxTraderLimit do {
+for "_i" from 0 to (_maxTraderLimit-1) do {
 	_traderSlotIndex = EPOCH_TraderSlots pushBack _i;
 
 	// Spawn static traders first