diff --git a/scripts/server/account.js b/scripts/server/account.js
index f21488f2..df1e27e3 100644
--- a/scripts/server/account.js
+++ b/scripts/server/account.js
@@ -937,13 +937,13 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress
 		} else {
 			messagePlayerError(client, "Password doesn't meet requirements!");
 		}
-		return false
+		return false;
 	}
 
 	if(doesServerHaveGUIEnabled() && doesPlayerHaveGUIEnabled(client)) {
 		if(!isValidEmailAddress(emailAddress)) {
 			showPlayerRegistrationFailedGUI(client, getLocaleString(client, "RegistrationFailedInvalidEmail"));
-			return false
+			return false;
 		}
 	}
 
@@ -1104,7 +1104,7 @@ function savePlayerToDatabase(client) {
 		return false;
 	}
 
-	if(!getPlayerData(client).loggedIn) {
+	if(!isPlayerLoggedIn(client)) {
 		return false;
 	}
 
diff --git a/scripts/server/discord.js b/scripts/server/discord.js
index 9e492b5f..d98264a6 100644
--- a/scripts/server/discord.js
+++ b/scripts/server/discord.js
@@ -104,7 +104,7 @@ function messageDiscordChatChannel(messageString) {
 // ===========================================================================
 
 function messageDiscordEventChannel(messageString) {
-	if(getServerConfig().devServer) {
+	if(getServerConfig().devServer == true) {
 		return false;
 	}
 
@@ -119,7 +119,7 @@ function messageDiscordEventChannel(messageString) {
 // ===========================================================================
 
 function messageDiscordAdminChannel(messageString) {
-	if(getServerConfig().devServer) {
+	if(getServerConfig().devServer == true) {
 		return false;
 	}
 
diff --git a/scripts/server/event.js b/scripts/server/event.js
index c196943c..aa0996fb 100644
--- a/scripts/server/event.js
+++ b/scripts/server/event.js
@@ -474,7 +474,7 @@ function onPlayerSpawn(client) {
 	}
 
 	logToConsole(LOG_DEBUG, `[VRR.Event] Checking ${getPlayerDisplayForConsole(client)}'s login status`);
-	if(!getPlayerData(client).loggedIn) {
+	if(!isPlayerLoggedIn(client)) {
 		logToConsole(LOG_DEBUG, `[VRR.Event] ${getPlayerDisplayForConsole(client)} is NOT logged in. Despawning their player.`);
 		client.disconnect();
 		return false;
diff --git a/scripts/server/job.js b/scripts/server/job.js
index 904b37d5..67360250 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -619,7 +619,7 @@ function stopWorking(client) {
 	if(jobVehicle) {
 		if(getPlayerVehicle(client) == jobVehicle) {
 			removePlayerFromVehicle(client);
-			//client.player.removeFromVehicle();
+			//getPlayerPed(client).removeFromVehicle();
 		}
 
 		respawnVehicle(jobVehicle);
diff --git a/scripts/server/misc.js b/scripts/server/misc.js
index dfaa7ea9..4f54b189 100644
--- a/scripts/server/misc.js
+++ b/scripts/server/misc.js
@@ -333,7 +333,7 @@ function checkPlayerSpawning() {
 	for(let i in clients) {
 		if(!isConsole(clients[i])) {
 			if(getPlayerData(clients[i])) {
-				if(getPlayerData(clients[i]).loggedIn) {
+				if(isPlayerLoggedIn(clients[i])) {
 					if(!getPlayerData(clients[i]).ped) {
 						if(clients[i].player != null) {
 							//getPlayerData(clients[i]).ped = clients[i].player;