Fix/migrations and specs