Tidy metadata a bit