diff --git a/godotsteam.cpp b/godotsteam.cpp
index 3ec0e843..eb061e66 100644
--- a/godotsteam.cpp
+++ b/godotsteam.cpp
@@ -8248,7 +8248,9 @@ Vector2i Steam::getImageSize(int index) {
 	Vector2i size_of(0, 0);
 	bool success = false;
 	if (SteamUtils() != NULL) {
-		success = SteamUtils()->GetImageSize(index, &(uint32)size_of.x, &(uint32)size_of.y);
+		uint32_t size_x = size_of.x;
+		uint32_t size_y = size_of.y;
+		success = SteamUtils()->GetImageSize(index, &size_x, &size_y);
 	}
 	return size_of;
 }
diff --git a/steam_id.h b/steam_id.h
index 72cfd340..902f007c 100644
--- a/steam_id.h
+++ b/steam_id.h
@@ -19,10 +19,10 @@ class SteamID : public RefCounted {
 	void setData(CSteamID value) {
 		data = value;
 	}
-	uint64 to_int() {
+	uint64_t to_int() {
 		return data.ConvertToUint64();
 	}
-	void from_int(uint64 i) {
+	void from_int(uint64_t i) {
 		data.SetFromUint64(i);
 	}
 	void from_CSteamID(CSteamID i) {
@@ -62,4 +62,4 @@ class SteamID : public RefCounted {
 
 };
 
-#endif // STEAM_ID
\ No newline at end of file
+#endif // STEAM_ID
diff --git a/steam_multiplayer_peer.cpp b/steam_multiplayer_peer.cpp
index 1d4ccdde..15381d86 100644
--- a/steam_multiplayer_peer.cpp
+++ b/steam_multiplayer_peer.cpp
@@ -25,7 +25,7 @@ SteamMultiplayerPeer::~SteamMultiplayerPeer() {
 	} 
 }
 
-uint64 SteamMultiplayerPeer::get_lobby_id() {
+uint64_t SteamMultiplayerPeer::get_lobby_id() {
 	return lobby_id.ConvertToUint64();
 }
 
@@ -301,7 +301,7 @@ void SteamMultiplayerPeer::set_steam_id_peer(CSteamID steamId, int peer_id) {
 	} else if (con->peer_id == peer_id) {
 		//nothing happens, set peer that already exists
 	} else {
-		DEBUG_DATA_SIGNAL_V("THIS STEAM ID GOT WRONG PEER ID", steamId.ConvertToUint64());
+		DEBUG_DATA_SIGNAL_V("THIS STEAM ID GOT WRONG PEER ID", (uint64_t)steamId.ConvertToUint64());
 		DEBUG_DATA_SIGNAL_V("PEER ID WAS", con->peer_id);
 		DEBUG_DATA_SIGNAL_V("TRYING TO SET AS", peer_id);
 	}
@@ -361,20 +361,20 @@ void SteamMultiplayerPeer::lobby_created_scb(LobbyCreated_t *lobby_data, bool io
 		lobby_state = LOBBY_STATE::LOBBY_STATE_HOSTING;
 		int connect = lobby_data->m_eResult;
 		lobby_id = lobby_data->m_ulSteamIDLobby;
-		uint64 lobby = lobby_id.ConvertToUint64();
+		uint64_t lobby = lobby_id.ConvertToUint64();
 		emit_signal(SNAME("lobby_created"), connect, lobby); // why do I do this? edit: no really, why am I doing this?
 	}
 }
 
-Error SteamMultiplayerPeer::join_lobby(uint64 lobbyId) {
+Error SteamMultiplayerPeer::join_lobby(uint64_t lobbyId) {
 	ERR_FAIL_COND_V_MSG(lobby_state != LOBBY_STATE::LOBBY_STATE_NOT_CONNECTED, ERR_ALREADY_IN_USE, "CANNOT JOIN A LOBBY WHILE IN A LOBBY!");
 
 	if (SteamMatchmaking() != NULL) {
 		lobby_state = LOBBY_STATE::LOBBY_STATE_CLIENT_PENDING;
-		this->lobby_id = lobbyId;
+		this->lobby_id.SetFromUint64(lobbyId);
 		// unique_id = SteamUser()->GetSteamID().GetAccountID();
 		unique_id = generate_unique_id();
-		SteamMatchmaking()->JoinLobby(CSteamID(lobbyId));
+		SteamMatchmaking()->JoinLobby(this->lobby_id);
 	}
 	return OK;
 }
@@ -821,7 +821,7 @@ int SteamMultiplayerPeer::get_peer_id_from_steam64(uint64_t steamid) {
 Dictionary SteamMultiplayerPeer::get_peer_map() {
 	Dictionary output;
 	for (auto E = connections_by_steamId64.begin(); E; ++E) {
-		output[E->value->peer_id] = E->value->steam_id.ConvertToUint64();
+		output[E->value->peer_id] = (uint64_t)E->value->steam_id.ConvertToUint64();
 	}
 	return output;
 }
diff --git a/steam_multiplayer_peer.h b/steam_multiplayer_peer.h
index 4865cea8..2ed6cf29 100644
--- a/steam_multiplayer_peer.h
+++ b/steam_multiplayer_peer.h
@@ -38,7 +38,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {
 
 	SteamMultiplayerPeer();
 	~SteamMultiplayerPeer();
-	uint64 get_lobby_id();
+	uint64_t get_lobby_id();
 
 	static void _bind_methods();
 
@@ -261,7 +261,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {
 			output["pending_unreliable"] = info.m_cbPendingUnreliable;
 			output["pending_reliable"] = info.m_cbPendingReliable;
 			output["sent_unacked_reliable"] = info.m_cbSentUnackedReliable;
-			output["queue_time"] = info.m_usecQueueTime;
+			output["queue_time"] = (uint64_t)info.m_usecQueueTime;
 
 			output["ping"] = info.m_nPing;
 			return output;
@@ -281,7 +281,7 @@ class SteamMultiplayerPeer : public MultiplayerPeer {
 	void removed_connection_peer(const CSteamID &steamId);
 
 	Error create_lobby(LOBBY_TYPE lobbyType, int max_players);
-	Error join_lobby(uint64 lobbyId);
+	Error join_lobby(uint64_t lobbyId);
 
 	STEAM_CALLBACK(SteamMultiplayerPeer, lobby_message_scb, LobbyChatMsg_t, callbackLobbyMessage);
 	STEAM_CALLBACK(SteamMultiplayerPeer, lobby_chat_update_scb, LobbyChatUpdate_t, callbackLobbyChatUpdate);