diff --git a/src/bftsmart/demo/bftmap/BFTMapServer.java b/src/bftsmart/demo/bftmap/BFTMapServer.java
index bdf7193591075c24751f6ee1c1c2bf16a4d98879..9e1365403306597b9793bf5aff39b7a77e914c19 100644
--- a/src/bftsmart/demo/bftmap/BFTMapServer.java
+++ b/src/bftsmart/demo/bftmap/BFTMapServer.java
@@ -43,13 +43,15 @@ import bftsmart.tom.server.defaultservices.DefaultSingleRecoverable;
  */
 public class BFTMapServer extends DefaultSingleRecoverable {
 
-    MapOfMaps tableMap = new MapOfMaps();
-    ServiceReplica replica = null;
-    private ReplicaContext replicaContext;
+    MapOfMaps tableMap = null;
+    //ServiceReplica replica = null;
+    //private ReplicaContext replicaContext;
 
     //The constructor passes the id of the server to the super class
     public BFTMapServer(int id) {
-    	replica = new ServiceReplica(id, this, this);
+        
+        tableMap = new MapOfMaps();
+        new ServiceReplica(id, this, this);
     }
 
     public static void main(String[] args){
@@ -276,9 +278,4 @@ public class BFTMapServer extends DefaultSingleRecoverable {
     }
 
     
-    @Override
-    public void setReplicaContext(ReplicaContext replicaContext) {
-    	this.replicaContext = replicaContext;
-    }
-
 }
\ No newline at end of file
diff --git a/src/bftsmart/demo/listvalue/BFTListImpl.java b/src/bftsmart/demo/listvalue/BFTListImpl.java
index 626a312fe663eae40ac16ccfbdb92371060d3b81..3b1744768a5ef8a9f0be9df4843787ab9bd687ef 100644
--- a/src/bftsmart/demo/listvalue/BFTListImpl.java
+++ b/src/bftsmart/demo/listvalue/BFTListImpl.java
@@ -45,18 +45,13 @@ import bftsmart.tom.server.defaultservices.DefaultRecoverable;
 public class BFTListImpl extends DefaultRecoverable {
 
     BFTMapList tableList = new BFTMapList();
-    ServiceReplica replica = null;
-    ReplicaContext replicaCtx;
-    
+    ServiceReplica replica = null;    
     //The constructor passes the id of the server to the super class
     public BFTListImpl(int id) {
         super();
     	replica = new ServiceReplica(id, this, this);
     }
 
-    public void setReplicaContext(ReplicaContext replicaCtx) {
-    	this.replicaCtx = replicaCtx;
-    }
     
     public static void main(String[] args){
         if(args.length < 1) {
diff --git a/src/bftsmart/demo/random/RandomServer.java b/src/bftsmart/demo/random/RandomServer.java
index 10592474c06608ea8f2175c7766f70f5bd3d9e47..984a6ac8a5aa3384f10a022a234d640cf2b0ba43 100644
--- a/src/bftsmart/demo/random/RandomServer.java
+++ b/src/bftsmart/demo/random/RandomServer.java
@@ -41,7 +41,6 @@ public final class RandomServer extends DefaultRecoverable {
     private long currentTime = -1;
     /***********************************************************************/
     private ServiceReplica replica;
-    private ReplicaContext replicaContext;
     
     public ServiceReplica getReplica() {
 		return replica;
@@ -51,9 +50,6 @@ public final class RandomServer extends DefaultRecoverable {
 		this.replica = replica;
 	}
 
-    public void setReplicaContext(ReplicaContext replicaContext) {
-    	this.replicaContext = replicaContext;
-    }
 
     public RandomServer(int id) {
     	replica = new ServiceReplica(id, this, this);
diff --git a/src/bftsmart/reconfiguration/ServerViewController.java b/src/bftsmart/reconfiguration/ServerViewController.java
index ee541def72238752e66c2d97b96345e006563639..e5014e2594c0714e04585c3c73b1edb8d64f7491 100644
--- a/src/bftsmart/reconfiguration/ServerViewController.java
+++ b/src/bftsmart/reconfiguration/ServerViewController.java
@@ -60,9 +60,12 @@ public class ServerViewController extends ViewController {
         super(procId, configHome);
         View cv = getViewStore().readView();
         if(cv == null){
+            
+            System.out.println("#Creating current view from configuration file");
             reconfigureTo(new View(0, getStaticConf().getInitialView(), 
                 getStaticConf().getF(), getInitAdddresses()));
         }else{
+            System.out.println("#Using view stored on disk");
             reconfigureTo(cv);
         }
        
diff --git a/src/bftsmart/tom/server/defaultservices/DefaultSingleRecoverable.java b/src/bftsmart/tom/server/defaultservices/DefaultSingleRecoverable.java
index 4889cc3990651216b5cba309dcd61329cee3529b..c6d4f616aa86e663640a5175715d4cb3c9d0f99e 100644
--- a/src/bftsmart/tom/server/defaultservices/DefaultSingleRecoverable.java
+++ b/src/bftsmart/tom/server/defaultservices/DefaultSingleRecoverable.java
@@ -98,6 +98,10 @@ public abstract class DefaultSingleRecoverable implements Recoverable, SingleExe
     }
     
     private StateLog getLog() {
+        
+        if(log == null)
+            	initLog();
+        
     	return log;
     }