diff --git a/r5dev/squirrel/sqapi.cpp b/r5dev/squirrel/sqapi.cpp
index 7f845125..cd0bf186 100644
--- a/r5dev/squirrel/sqapi.cpp
+++ b/r5dev/squirrel/sqapi.cpp
@@ -11,13 +11,13 @@
 //---------------------------------------------------------------------------------
 SQChar* sq_getstring(HSQUIRRELVM v, SQInteger i)
 {
-	return *(char**)(*(std::int64_t*)(v->_stackbase) + 0x10 * i + 0x8) + 0x40;
+	return *(char**)(*(std::int64_t*)(v->_stackbase) + 0x10 * static_cast<long long>(i) + 0x8) + 0x40;
 }
 
 //---------------------------------------------------------------------------------
 SQInteger sq_getinteger(HSQUIRRELVM v, SQInteger i)
 {
-	return *(SQInteger*)(*(std::int64_t*)(v->_stackbase) + 0x10 * i + 0x8);
+	return *(SQInteger*)(*(std::int64_t*)(v->_stackbase) + 0x10 * static_cast<long long>(i) + 0x8);
 }
 
 //---------------------------------------------------------------------------------
diff --git a/r5dev/squirrel/sqinit.cpp b/r5dev/squirrel/sqinit.cpp
index 360f8850..acca7439 100644
--- a/r5dev/squirrel/sqinit.cpp
+++ b/r5dev/squirrel/sqinit.cpp
@@ -229,7 +229,7 @@ namespace VSquirrel
         //-----------------------------------------------------------------------------
         SQRESULT SetEncKeyAndConnect(HSQUIRRELVM v)
         {
-            int iServerIndex = sq_getinteger(v, 1);
+            SQInteger iServerIndex = sq_getinteger(v, 1);
 
             // !TODO: Create glue class instead.
             g_pBrowser->ConnectToServer(g_pBrowser->m_vServerList[iServerIndex].svIpAddress, g_pBrowser->m_vServerList[iServerIndex].svPort, g_pBrowser->m_vServerList[iServerIndex].svEncryptionKey);