diff --git a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java
index 5dea70100df5627b1f35cf79bcf516caa714e55a..7cbafa56029dfeb364b3882f065dfc06ec6efa73 100644
--- a/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java
+++ b/jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLWorker.java
@@ -51,9 +51,10 @@ public class CRLWorker extends X509Worker<RevocationRequest> {
 
     public CRLWorker(PrivateKey privateKey, X509Certificate certificate) {
         super(privateKey, certificate);
+        //TODO: The CRL needs to be loaded from somewhere.
+
         this.setDaemon(true);
         this.start();
-        //TODO: The CRL needs to be loaded from memory
         log.info("Instantiated & started a CRL Worker...");
     }
 
diff --git a/jams-launcher/src/main/java/launcher/AppStarter.java b/jams-launcher/src/main/java/launcher/AppStarter.java
index d19d7dd1f502cea4b87c64740143b68ac9fccdf6..5fe3d848fa7edd9a49dda7700e5dc1fe5eec351f 100644
--- a/jams-launcher/src/main/java/launcher/AppStarter.java
+++ b/jams-launcher/src/main/java/launcher/AppStarter.java
@@ -41,9 +41,9 @@ public class AppStarter extends Thread {
     private final AtomicBoolean doUpdate = new AtomicBoolean(false);
     private Server server;
     private AppUpdater appUpdater;
-    private static Integer port;
-    private static String serverCertificate;
-    private static String serverPrivateKey;
+    private static Integer port = 8080;
+    private static String serverCertificate = null;
+    private static String serverPrivateKey = null;
 
 
     /**
diff --git a/jams-server/src/main/java/net/jami/jams/server/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index 8737109ce91c71e81b042b0e37aac13b6ae998bb..da45b671db4329763655cf310f96f205e57883a7 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -75,9 +75,6 @@ public class Server {
         //This is a fix to drop old cached stuff from the tomcat classloader.
         ClassPool.getDefault().clearImportedPackages();
         switch (args.length) {
-            case 0:
-                tomcatLauncher = new TomcatLauncher(8080);
-                break;
             case 1:
                 tomcatLauncher = new TomcatLauncher(Integer.parseInt(args[0]));
                 break;