Fixes to metadata