small modifications to our models and migrations to fix bugs