diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java
index d561784..27291ef 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java
@@ -31,7 +31,7 @@
 @Service
 public class SimpleIdBlockStore implements IdBlockStore {
 
-    private static final long DEFAULT_BLOCK_SIZE = 1000L;
+    private static final long DEFAULT_BLOCK_SIZE = 0x1000L;
 
     private final Map<String, AtomicLong> topicBlocks = new ConcurrentHashMap<>();
 
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
index 475beb5..4a5e692 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
@@ -69,8 +69,7 @@
             return;
         }
         intents.put(intent.id(), intent);
-        this.setState(intent, IntentState.SUBMITTED);
-        return;
+        this.setState(intent, IntentState.INSTALL_REQ);
     }
 
     @Override
@@ -109,8 +108,8 @@
         IntentEvent.Type type = null;
 
         switch (state) {
-        case SUBMITTED:
-            type = IntentEvent.Type.SUBMITTED;
+        case INSTALL_REQ:
+            type = IntentEvent.Type.INSTALL_REQ;
             break;
         case INSTALLED:
             type = IntentEvent.Type.INSTALLED;
@@ -118,6 +117,9 @@
         case FAILED:
             type = IntentEvent.Type.FAILED;
             break;
+        case WITHDRAW_REQ:
+            type = IntentEvent.Type.WITHDRAW_REQ;
+            break;
         case WITHDRAWN:
             type = IntentEvent.Type.WITHDRAWN;
             break;
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java
index b10ac60..cf3c043 100644
--- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java
+++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java
@@ -59,6 +59,7 @@
 
     @Override
     public Map<String, Leadership> getLeaderBoard() {
+        //FIXME
         throw new UnsupportedOperationException("I don't know what to do." +
                                                         " I wish you luck.");
     }