diff --git a/app/models.py b/app/models.py
index 2ed7cd771..445977251 100644
--- a/app/models.py
+++ b/app/models.py
@@ -278,7 +278,7 @@ class Template(db.Model):
     subject = db.Column(db.Text, index=False, unique=False, nullable=True)
     created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
     created_by = db.relationship('User')
-    version = db.Column(db.Integer, default=1)
+    version = db.Column(db.Integer, default=1, nullable=False)
 
 
 class TemplateHistory(db.Model):
@@ -296,7 +296,7 @@ class TemplateHistory(db.Model):
     subject = db.Column(db.Text)
     created_by_id = db.Column(UUID(as_uuid=True), db.ForeignKey('users.id'), index=True, nullable=False)
     created_by = db.relationship('User')
-    version = db.Column(db.Integer, primary_key=True)
+    version = db.Column(db.Integer, primary_key=True, nullable=False)
 
 
 MMG_PROVIDER = "mmg"
diff --git a/migrations/versions/0056_minor_updates.py b/migrations/versions/0056_minor_updates.py
new file mode 100644
index 000000000..a253e69c5
--- /dev/null
+++ b/migrations/versions/0056_minor_updates.py
@@ -0,0 +1,46 @@
+"""empty message
+
+Revision ID: 0056_minor_updates
+Revises: 0055_service_whitelist
+Create Date: 2016-10-04 09:43:42.321138
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0056_minor_updates'
+down_revision = '0055_service_whitelist'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('service_whitelist', 'recipient',
+               existing_type=sa.VARCHAR(length=255),
+               nullable=False)
+    op.alter_column('services', 'research_mode',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+    op.alter_column('services_history', 'research_mode',
+               existing_type=sa.BOOLEAN(),
+               nullable=False)
+    op.create_foreign_key('templates_history_service_id_fkey', 'templates_history', 'services', ['service_id'], ['id'])
+    op.create_foreign_key('templates_history_created_by_id_fkey', 'templates_history', 'users', ['created_by_id'], ['id'])
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('templates_history_service_id_fkey', 'templates_history', type_='foreignkey')
+    op.drop_constraint('templates_history_created_by_id_fkey', 'templates_history', type_='foreignkey')
+    op.alter_column('services_history', 'research_mode',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+    op.alter_column('services', 'research_mode',
+               existing_type=sa.BOOLEAN(),
+               nullable=True)
+    op.alter_column('service_whitelist', 'recipient',
+               existing_type=sa.VARCHAR(length=255),
+               nullable=True)
+    ### end Alembic commands ###