Fixing errors introduced by the migration case