diff --git a/composer/schema/browser/schema.py b/composer/schema/browser/schema.py
index fdeca3b..14970b4 100644
--- a/composer/schema/browser/schema.py
+++ b/composer/schema/browser/schema.py
@@ -35,6 +35,8 @@ class SchemaView(BaseView):
 
     formState = FormState()
 
+    isManageMode = False
+
     @Lazy
     def fields(self):
         return self.context.fields
@@ -62,6 +64,10 @@ class SchemaView(BaseView):
         return data
 
     def update(self):
+        if self.isManageMode:
+            # Don't store anything when editing
+            self.request.response.redirect(self.nextUrl())
+            return False
         newClient = False
         form = self.request.form
         clientName = self.getClientName()
diff --git a/composer/schema/instance.py b/composer/schema/instance.py
index e873b82..747e87d 100644
--- a/composer/schema/instance.py
+++ b/composer/schema/instance.py
@@ -53,6 +53,7 @@ class Instance(BaseInstance):
                     continue
                 fi = f.getFieldInstance()
                 name = f.name
+                #value = getattr(self.context, name, field.default)
                 value = getattr(self.context, name, u'')
                 value = (mode == 'view' and fi.display(value)) or fi.marshall(value)
                 result[name] = value