Some small changes and metadata migrtion v8