diff --git a/src/game/scripting/function_tables.cpp b/src/game/scripting/function_tables.cpp
index b119525d..cda014fd 100644
--- a/src/game/scripting/function_tables.cpp
+++ b/src/game/scripting/function_tables.cpp
@@ -302,14 +302,14 @@ namespace scripting
         {"visionsetmissilecam", 330},
         {"ambientstop", 331},
         {"precachemodel", 332},
-        {"sub_7ff7de27b670", 333},
-        {"sub_7ff7de281fc0", 334},
-        {"sub_7ff7de282120", 335},
-        {"sub_7ff7de282390", 336},
-        {"sub_7ff7de2825f0", 337},
-        {"initdefaultviewmodelrumbles", 338},
-        {"sub_7ff7de27b550", 339},
-        {"sub_7ff7de282190", 340},
+        {"precacheshellshock", 333},
+        {"precacheitem", 334},
+        {"precacheshader", 335},
+        {"precachestring", 336},
+        {"precachemenu", 337},
+        {"precacherumble", 338},
+        {"precachelocationselector", 339},
+        {"precacheleaderboards", 340},
         {"loadfx", 341},
         {"playfx", 342},
         {"sub_7ff7de275db0", 343},
@@ -774,14 +774,14 @@ namespace scripting
         {"sub_7ff7de27c140", 32950},
         {"delete", 32951},
         {"setmodel", 32952},
-        {"sub_7ff7de27c720", 32953},
-        {"sub_7ff7de27c8b0", 32954},
-        {"sub_7ff7de27c9a0", 32957},
-        {"sub_7ff7de27d190", 32958},
+        {"laseraltviewon", 32953},
+        {"laseraltviewoff", 32954},
+        {"thermalvisionon", 32957},
+        {"thermalvisionoff", 32958},
         {"laseraltviewon", 32959},
         {"laseraltviewoff", 32960},
         {"setcontents", 32965},
-        {"makevehiclesolidcapsule", 32966},
+        {"makeusable", 32966},
         {"makeunusable", 32967},
         {"sub_7ff7de273270", 32968},
         {"sub_7ff7de273800", 32969},
@@ -807,16 +807,16 @@ namespace scripting
         {"setclockup", 32989},
         {"setvalue", 32990},
         {"setwaypoint", 32991},
-        {"sub_7ff7de250930", 32992},
-        {"sub_7ff7de27b300", 32993},
-        {"sub_7ff7de27ba30", 32994},
+        {"setwaypointedgestyle_rotatingicon", 32992},
+        {"setcursorhint", 32993},
+        {"sethintstring", 32994},
         {"forceusehinton", 32996},
         {"forceusehintoff", 32997},
-        {"sub_7ff7de27af40", 32998},
-        {"sub_7ff7de27b0f0", 32999},
+        {"makesoft", 32998},
+        {"makehard", 32999},
         {"nullsub_297", 33000},
-        {"sub_7ff7de289400", 33001},
-        {"sub_7ff7de289740", 33002},
+        {"startfiring", 33001},
+        {"stopfiring", 33002},
         {"isfiringturret", 33003},
         {"startbarrelspin", 33004},
         {"stopbarrelspin", 33005},
@@ -1299,7 +1299,7 @@ namespace scripting
         {"getviewkickscale", 33557},
         {"getweaponslistall", 33558},
         {"getweaponslistprimaries", 33559},
-        {"sub_7ff7de242f90", 33560},
+        {"getnormalizedcameramovement", 33560},
         {"giveweapon", 33561},
         {"takeweapon", 33562},
         {"takeallweapons", 33563},
diff --git a/src/game/scripting/lua/value_conversion.cpp b/src/game/scripting/lua/value_conversion.cpp
index c9cec6df..8a34c4cb 100644
--- a/src/game/scripting/lua/value_conversion.cpp
+++ b/src/game/scripting/lua/value_conversion.cpp
@@ -93,7 +93,7 @@ namespace scripting::lua
 
 				if (values.find(key) == values.end())
 				{
-					return sol::lua_value{};
+					return sol::lua_value{s, sol::lua_nil};
 				}
 
 				return convert(s, values.at(key).value);