More metadata tweakeing.