diff --git a/src/modules/efs_shell_commands/ln.py b/src/modules/efs_shell_commands/ln.py
index 5799331..9c7bda8 100644
--- a/src/modules/efs_shell_commands/ln.py
+++ b/src/modules/efs_shell_commands/ln.py
@@ -21,8 +21,8 @@ def get_argument_parser(self, subparsers_object : _SubParsersAction) -> Argument
         argument_parser = subparsers_object.add_parser('ln',
             description = "Create an UNIX symbolic link across the remote EFS.")
         
-        argument_parser.add_argument('remote_newlink')
         argument_parser.add_argument('remote_target')
+        argument_parser.add_argument('remote_newlink')
         
         return argument_parser
         
@@ -33,8 +33,8 @@ def execute_command(self, diag_input, args : Namespace):
         opcode, payload = diag_input.send_recv(DIAG_SUBSYS_CMD_F, pack('<BH',
             DIAG_SUBSYS_FS, # Command subsystem number
             EFS2_DIAG_SYMLINK,
-        ) + args.remote_newlink.encode('latin1').decode('unicode_escape').encode('latin1') + b'\x00'
-          + args.remote_target.encode('latin1').decode('unicode_escape').encode('latin1') + b'\x00', accept_error = True)
+        ) + args.remote_target.encode('latin1').decode('unicode_escape').encode('latin1') + b'\x00'
+          + args.remote_newlink.encode('latin1').decode('unicode_escape').encode('latin1') + b'\x00', accept_error = True)
         
         if opcode != DIAG_SUBSYS_CMD_F:
             print('Error executing SYMLINK: %s received with payload "%s"' % (
diff --git a/src/modules/efs_shell_commands/rm.py b/src/modules/efs_shell_commands/rm.py
index f48f7d4..bd430eb 100644
--- a/src/modules/efs_shell_commands/rm.py
+++ b/src/modules/efs_shell_commands/rm.py
@@ -27,28 +27,27 @@ def get_argument_parser(self, subparsers_object : _SubParsersAction) -> Argument
         
     def execute_command(self, diag_input, args : Namespace):
     
-        # First, emit a stat() (EFS2_DIAG_STAT) call in order to understand whether
-        # the remote path input by the user is a directory or not
+        # First, emit an lstat() (EFS2_DIAG_LSTAT) call in order to understand
+        # whether the remote path input by the user is a directory or not
         
         is_directory : bool = False
         
         opcode, payload = diag_input.send_recv(DIAG_SUBSYS_CMD_F, pack('<BH',
             DIAG_SUBSYS_FS, # Command subsystem number
-            EFS2_DIAG_STAT,
+            EFS2_DIAG_LSTAT,
         ) + args.path.encode('latin1').decode('unicode_escape').encode('latin1') + b'\x00', accept_error = True)
         
         if opcode != DIAG_SUBSYS_CMD_F:
     
-            print('Error executing STAT: %s received with payload "%s"' % (message_id_to_name.get(opcode, opcode),
+            print('Error executing LSTAT: %s received with payload "%s"' % (message_id_to_name.get(opcode, opcode),
                 repr(payload)))
             return
     
         (cmd_subsystem_id, subcommand_code,
-            errno, file_mode, file_size, num_links,
-            atime, mtime, ctime) = unpack('<BH7i', payload)
+            errno, file_mode, atime, mtime, ctime) = unpack('<BH5i', payload)
         
         if errno:
-            print('Error executing STAT: %s' % (EFS2_ERROR_CODES.get(errno) or strerror(errno)))
+            print('Error executing LSTAT: %s' % (EFS2_ERROR_CODES.get(errno) or strerror(errno)))
             return
         
         if file_mode & 0o170000 == 0o040000: # S_IFDIR
diff --git a/src/protocol/efs2.py b/src/protocol/efs2.py
index 06cb2ab..2d75dbd 100644
--- a/src/protocol/efs2.py
+++ b/src/protocol/efs2.py
@@ -17,6 +17,7 @@
 }
 
 EFS2_FILE_TYPES = {
+    0o000000: 'Unknown',
     0o010000: 'FIFO (S_IFIFO)',
     0o020000: 'Character device (S_IFCHR)',
     0o040000: 'Directory (S_IFDIR)',