diff --git a/client/functions.lua b/client/functions.lua
index a4070355..177bf7f5 100644
--- a/client/functions.lua
+++ b/client/functions.lua
@@ -944,7 +944,7 @@ ESX.ShowInventory = function()
 	}, function(data, menu)
 		menu.close()
 		local player, distance = ESX.Game.GetClosestPlayer()
-		local elements = {}
+		elements = {}
 
 		if data.current.usable then
 			table.insert(elements, {label = _U('use'), action = 'use', type = data.current.type, value = data.current.value})
@@ -975,10 +975,11 @@ ESX.ShowInventory = function()
 				local playersNearby = ESX.Game.GetPlayersInArea(GetEntityCoords(playerPed), 3.0)
 
 				if #playersNearby > 0 then
-					local players, elements = {}, {}
+					local players = {}
+					elements = {}
 
-					for k,player in ipairs(playersNearby) do
-						players[GetPlayerServerId(player)] = true
+					for k,playerNearby in ipairs(playersNearby) do
+						players[GetPlayerServerId(playerNearby)] = true
 					end
 
 					ESX.TriggerServerCallback('esx:getPlayerNames', function(returnedPlayers)
diff --git a/client/main.lua b/client/main.lua
index cbfe984d..e66cce33 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -255,8 +255,8 @@ AddEventHandler('esx:setJob', function(job)
 end)
 
 RegisterNetEvent('esx:spawnVehicle')
-AddEventHandler('esx:spawnVehicle', function(vehicle)
-	local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle))
+AddEventHandler('esx:spawnVehicle', function(vehicleName)
+	local model = (type(vehicleName) == 'number' and vehicleName or GetHashKey(vehicleName))
 
 	if IsModelInCdimage(model) then
 		local playerPed = PlayerPedId()
@@ -266,7 +266,7 @@ AddEventHandler('esx:spawnVehicle', function(vehicle)
 			TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
 		end)
 	else
-		TriggerEvent('chat:addMessage', { args = { '^1SYSTEM', 'Invalid vehicle model.' } })
+		TriggerEvent('chat:addMessage', {args = {'^1SYSTEM', 'Invalid vehicle model.'}})
 	end
 end)
 
diff --git a/server/functions.lua b/server/functions.lua
index 601f27f0..5038c059 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -166,7 +166,7 @@ end
 ESX.SavePlayer = function(xPlayer, cb)
 	local asyncTasks = {}
 
-	table.insert(asyncTasks, function(cb)
+	table.insert(asyncTasks, function(cb2)
 		MySQL.Async.execute('UPDATE users SET accounts = @accounts, job = @job, job_grade = @job_grade, `group` = @group, loadout = @loadout, position = @position, inventory = @inventory WHERE identifier = @identifier', {
 			['@accounts'] = json.encode(xPlayer.getAccounts(true)),
 			['@job'] = xPlayer.job.name,
@@ -177,7 +177,7 @@ ESX.SavePlayer = function(xPlayer, cb)
 			['@identifier'] = xPlayer.getIdentifier(),
 			['@inventory'] = json.encode(xPlayer.getInventory(true))
 		}, function(rowsChanged)
-			cb()
+			cb2()
 		end)
 	end)
 
@@ -194,9 +194,9 @@ ESX.SavePlayers = function(cb)
 	local xPlayers, asyncTasks = ESX.GetPlayers(), {}
 
 	for i=1, #xPlayers, 1 do
-		table.insert(asyncTasks, function(cb)
+		table.insert(asyncTasks, function(cb2)
 			local xPlayer = ESX.GetPlayerFromId(xPlayers[i])
-			ESX.SavePlayer(xPlayer, cb)
+			ESX.SavePlayer(xPlayer, cb2)
 		end)
 	end