Fix Metadata not being set
Merge branch 'meta'