diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua
index f8ca6c9c7..39bd03ceb 100644
--- a/res/content/base/scripts/components/drop.lua
+++ b/res/content/base/scripts/components/drop.lua
@@ -25,7 +25,7 @@ function on_save()
     SAVED_DATA.data = dropitem.data
 end
 
-if not VC_HEADLESS then
+if vc.is_client() then
     local scale = {1, 1, 1}
     local rotation = mat4.rotate({
         math.random(), math.random(), math.random()
diff --git a/res/content/base/scripts/components/falling_block.lua b/res/content/base/scripts/components/falling_block.lua
index 9bb02e25a..01c5bc5f2 100644
--- a/res/content/base/scripts/components/falling_block.lua
+++ b/res/content/base/scripts/components/falling_block.lua
@@ -11,7 +11,7 @@ else
     SAVED_DATA.states = blockstates
 end
 
-if not VC_HEADLESS then-- setup visuals
+if vc.is_client() then-- setup visuals
     local rig = entity.skeleton
     local id = block.index(blockid)
     local rotation = block.decompose_state(blockstates)[1]
diff --git a/res/content/base/scripts/world.lua b/res/content/base/scripts/world.lua
index 9698eef54..419dcc769 100644
--- a/res/content/base/scripts/world.lua
+++ b/res/content/base/scripts/world.lua
@@ -1,5 +1,5 @@
 function on_block_broken(id, x, y, z, playerid)
-    if not VC_HEADLESS then
+    if vc.is_client() then
         local size = {block.get_size(id)}
         gfx.particles.emit({
             x + size[1] * 0.5, 
diff --git a/res/scripts/components/player.lua b/res/scripts/components/player.lua
index f033a2998..4f2ec53a8 100644
--- a/res/scripts/components/player.lua
+++ b/res/scripts/components/player.lua
@@ -80,7 +80,7 @@ function on_physics_update(delta)
     local front = mat4.mul(rot, {0, 0, -1})
     local pos = tsf:get_pos()
 
-    if not VC_HEADLESS and pid == hud.get_player() then
+    if vc.is_client() and pid == hud.get_player() then
         process_player_inputs(pid, rot, delta)
     end
     mob.look_at(vec3.add(pos, front))
diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 4ae34b2fd..be437513e 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -1,5 +1,18 @@
+local _vc_headless = __VC_HEADLESS
+__VC_HEADLESS = nil
+
+vc = {
+    is_headless = function()
+        return _vc_headless
+    end,
+    is_client = function ()
+        return not _vc_headless
+    end
+}
+
 local _ffi = ffi
 local _debug_getinfo = debug.getinfo
+local _crc32 = crc32
 
 function crc32(bytes, chksum)
     chksum = chksum or 0
diff --git a/src/logic/scripting/lua/lua_engine.cpp b/src/logic/scripting/lua/lua_engine.cpp
index c27f31293..07fdfe8d2 100644
--- a/src/logic/scripting/lua/lua_engine.cpp
+++ b/src/logic/scripting/lua/lua_engine.cpp
@@ -95,7 +95,7 @@ static void create_libs(State* L, StateType stateType) {
     }
 
     addfunc(L, "print", lua::wrap<l_print>);
-    addfunc(L, "_crc32", lua::wrap<l_crc32>);
+    addfunc(L, "crc32", lua::wrap<l_crc32>);
 }
 
 void lua::init_state(State* L, StateType stateType) {
@@ -146,7 +146,7 @@ void lua::initialize(const EnginePaths& paths, const CoreParameters& params) {
     lua::setglobal(main_thread, "__VC_SCRIPT_NAME");
 
     lua::pushboolean(main_thread, params.headless);
-    lua::setglobal(main_thread, "VC_HEADLESS");
+    lua::setglobal(main_thread, "__VC_HEADLESS");
 }
 
 void lua::finalize() {