More metadata tweaks