diff --git a/cli/src/commands/org/jnode/command/common/EchoCommand.java b/cli/src/commands/org/jnode/command/common/EchoCommand.java
index 2b88b99a21..0b0516359d 100644
--- a/cli/src/commands/org/jnode/command/common/EchoCommand.java
+++ b/cli/src/commands/org/jnode/command/common/EchoCommand.java
@@ -52,6 +52,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute the command
      */
+    @Override
     public void execute() throws Exception {
         PrintWriter out = getOutput().getPrintWriter();
         String[] words = argWords.getValues();
diff --git a/cli/src/commands/org/jnode/command/common/ExitCommand.java b/cli/src/commands/org/jnode/command/common/ExitCommand.java
index d99b891e27..6438e4550e 100644
--- a/cli/src/commands/org/jnode/command/common/ExitCommand.java
+++ b/cli/src/commands/org/jnode/command/common/ExitCommand.java
@@ -43,6 +43,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute this command
      */
+    @Override
     public void execute() throws Exception {
         ShellManager sm = InitialNaming.lookup(ShellManager.NAME);
         ((CommandShell) sm.getCurrentShell()).exit();
diff --git a/cli/src/commands/org/jnode/command/common/FalseCommand.java b/cli/src/commands/org/jnode/command/common/FalseCommand.java
index 108863a456..5699136172 100644
--- a/cli/src/commands/org/jnode/command/common/FalseCommand.java
+++ b/cli/src/commands/org/jnode/command/common/FalseCommand.java
@@ -42,6 +42,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute the command
      */
+    @Override
     public void execute() throws Exception {
         exit(1);
     }
diff --git a/cli/src/commands/org/jnode/command/common/SleepCommand.java b/cli/src/commands/org/jnode/command/common/SleepCommand.java
index 021807c586..508a1983b0 100644
--- a/cli/src/commands/org/jnode/command/common/SleepCommand.java
+++ b/cli/src/commands/org/jnode/command/common/SleepCommand.java
@@ -48,6 +48,7 @@ public static void main(String[] args) throws Exception {
         new SleepCommand().execute(args);
     }
 
+    @Override
     public void execute() throws Exception {
         Integer seconds = argSeconds.getValue();
         if (seconds > 0) {
diff --git a/cli/src/commands/org/jnode/command/common/TrueCommand.java b/cli/src/commands/org/jnode/command/common/TrueCommand.java
index d751af2109..a9b404bcb8 100644
--- a/cli/src/commands/org/jnode/command/common/TrueCommand.java
+++ b/cli/src/commands/org/jnode/command/common/TrueCommand.java
@@ -42,6 +42,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute the command
      */
+    @Override
     public void execute() throws Exception {
     }
 }
diff --git a/cli/src/commands/org/jnode/command/common/UptimeCommand.java b/cli/src/commands/org/jnode/command/common/UptimeCommand.java
index 78701e3051..f7ffab0399 100644
--- a/cli/src/commands/org/jnode/command/common/UptimeCommand.java
+++ b/cli/src/commands/org/jnode/command/common/UptimeCommand.java
@@ -44,6 +44,7 @@ public UptimeCommand() {
     /**
      * @throws Exception if something happens
      */
+    @Override
     public void execute() throws Exception {
         PrintWriter out = getOutput().getPrintWriter();
         long ut_secs = VmSystem.currentKernelMillis() / 1000;
diff --git a/cli/src/commands/org/jnode/command/file/PwdCommand.java b/cli/src/commands/org/jnode/command/file/PwdCommand.java
index 5a266294d8..5ff330a5a7 100644
--- a/cli/src/commands/org/jnode/command/file/PwdCommand.java
+++ b/cli/src/commands/org/jnode/command/file/PwdCommand.java
@@ -39,6 +39,7 @@ public static void main(String[] args) throws Exception {
         new PwdCommand().execute(args);
     }
 
+    @Override
     public void execute() {
         File file = new File("");
         getOutput().getPrintWriter().println(file.getAbsolutePath());
diff --git a/cli/src/commands/org/jnode/command/system/CpuIDCommand.java b/cli/src/commands/org/jnode/command/system/CpuIDCommand.java
index 0d1d58d426..20a7a2af31 100644
--- a/cli/src/commands/org/jnode/command/system/CpuIDCommand.java
+++ b/cli/src/commands/org/jnode/command/system/CpuIDCommand.java
@@ -43,6 +43,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute this command
      */
+    @Override
     public void execute() {
         final VmProcessor cpu = VmProcessor.current();
         PrintWriter out = getOutput().getPrintWriter();
diff --git a/cli/src/commands/org/jnode/command/system/MemoryCommand.java b/cli/src/commands/org/jnode/command/system/MemoryCommand.java
index fcfba8eacc..2a45e1aba9 100644
--- a/cli/src/commands/org/jnode/command/system/MemoryCommand.java
+++ b/cli/src/commands/org/jnode/command/system/MemoryCommand.java
@@ -47,6 +47,7 @@ public MemoryCommand() {
     /**
      * Execute this command
      */
+    @Override
     public void execute() throws Exception {
         PrintWriter out = getOutput().getPrintWriter();
         final Runtime rt = Runtime.getRuntime();
diff --git a/cli/src/commands/org/jnode/command/system/NamespaceCommand.java b/cli/src/commands/org/jnode/command/system/NamespaceCommand.java
index 92eb5316d7..49ab449e66 100644
--- a/cli/src/commands/org/jnode/command/system/NamespaceCommand.java
+++ b/cli/src/commands/org/jnode/command/system/NamespaceCommand.java
@@ -44,6 +44,7 @@ public static void main(String[] args) throws Exception {
     /**
      * Execute this command
      */
+    @Override
     public void execute() throws Exception {
         PrintWriter out = getOutput().getPrintWriter();
         Set<Class< ? >> names = InitialNaming.nameSet();