General: Minor tweaks to media metadata