diff --git a/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua b/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua
index ee6a39649..cacddd419 100644
--- a/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua
+++ b/src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua
@@ -24,32 +24,23 @@ function os.getenv(varname)
   local env = env()
   if not varname then
     return env
+  elseif varname == '#' then
+    return #env
   end
   return env[varname]
 end
 
 function os.setenv(varname, value)
   checkArg(1, varname, "string", "number")
-  if value == nil then
-    env()[varname] = nil
-  else
-    local success, val = pcall(tostring, value)
-    if success then
-      env()[varname] = val
-      return val
-    else
-      return nil, val
-    end
+  if value ~= nil then
+    value = tostring(value)
   end
+  env()[varname] = value
+  return value
 end
 
-function os.remove(...)
-  return fs.remove(...)
-end
-
-function os.rename(...)
-  return fs.rename(...)
-end
+os.remove = fs.remove
+os.rename = fs.rename
 
 function os.sleep(timeout)
   checkArg(1, timeout, "number", "nil")