Some smaller changes in the metadata generation.