Cosmetic metadata fixes