diff --git a/halyde/apps/lscor.lua b/halyde/apps/lscor.lua
index 3ef4cd9..0481e47 100644
--- a/halyde/apps/lscor.lua
+++ b/halyde/apps/lscor.lua
@@ -4,5 +4,5 @@ for i=1, #tasks do
     local pipeChar = "├ "
     if i==#tasks then pipeChar = "└ " end
     local task = tasks[i]
-    print("\27[93m"..pipeChar..i.."\27[0m - "..task.name.."\27[37m "..table.concat(task.args or {}," ").." \27[0m")
+    print("\27[93m"..pipeChar..(task.id or i).."\27[0m - "..task.name.."\27[37m "..table.concat(task.args or {}," ").." \27[0m")
 end
diff --git a/halyde/apps/mv.lua b/halyde/apps/mv.lua
index d974660..4d5af43 100644
--- a/halyde/apps/mv.lua
+++ b/halyde/apps/mv.lua
@@ -1,4 +1,5 @@
 local fromFile, toFile = ...
+local shell = require("shell")
 local fs = require("filesystem")
 
 if not fromFile or not toFile then
@@ -6,10 +7,10 @@ if not fromFile or not toFile then
   return
 end
 if fromFile:sub(1, 1) ~= "/" then
-  fromFile = fs.concat(shell.workingDirectory, fromFile)
+  fromFile = fs.concat(shell.getWorkingDirectory(), fromFile)
 end
 if toFile:sub(1, 1) ~= "/" then
-  toFile = fs.concat(shell.workingDirectory, toFile)
+  toFile = fs.concat(shell.getWorkingDirectory(), toFile)
 end
 if fromFile == toFile then
   print("\27[91mSource and destination are the same.")
diff --git a/halyde/apps/rm.lua b/halyde/apps/rm.lua
index d8fa1a9..bf9eccf 100644
--- a/halyde/apps/rm.lua
+++ b/halyde/apps/rm.lua
@@ -1,4 +1,5 @@
 local file = ...
+local shell = require("shell")
 local fs = require("filesystem")
 
 if not file then
@@ -6,7 +7,7 @@ if not file then
   return
 end
 if file:sub(1, 1) ~= "/" then
-  file = fs.concat(shell.workingDirectory, file)
+  file = fs.concat(shell.getWorkingDirectory(), file)
 end
 if not fs.exists(file) then
   print("\27[91mFile does not exist.")
diff --git a/halyde/apps/rtest.lua b/halyde/apps/rtest.lua
index d5b202c..b9ad6f6 100644
--- a/halyde/apps/rtest.lua
+++ b/halyde/apps/rtest.lua
@@ -88,4 +88,4 @@ end
 end ]]
 
 raster.free()
-termlib.cursorPosY=1
+terminal.setCursorPos(1,1)