diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
index 5f65030..0b0aaaf 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
@@ -201,7 +201,7 @@
                 } else {
                     log.info("Write failed trying to write{}", next);
                 }
-            } while(retry-- > 0);
+            } while (retry-- > 0);
         } catch (Exception e) {
             log.error("Exception thrown", e);
         }
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
index 421f9cc..0c33485 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
@@ -34,7 +34,6 @@
 import org.onlab.onos.store.service.NoSuchTableException;
 import org.onlab.onos.store.service.OptimisticLockException;
 import org.onlab.onos.store.service.OptionalResult;
-import org.onlab.onos.store.service.PreconditionFailedException;
 import org.onlab.onos.store.service.ReadRequest;
 import org.onlab.onos.store.service.ReadResult;
 import org.onlab.onos.store.service.WriteAborted;
@@ -195,8 +194,8 @@
     }
 
     @Override
-    public WriteResult write(WriteRequest request)
-            throws OptimisticLockException, PreconditionFailedException {
+    public WriteResult write(WriteRequest request) {
+//            throws OptimisticLockException, PreconditionFailedException {
         return writeNothrow(request).get();
     }
 
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
index 9c323f0..9ef9cb6 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
@@ -117,6 +117,8 @@
             return InternalWriteResult.Status.PREVIOUS_VERSION_MISMATCH;
         case REMOVE:
             return InternalWriteResult.Status.OK;
+        default:
+            break;
         }
         log.error("Should never reach here {}", request);
         return InternalWriteResult.Status.ABORTED;