Metadata fixes part 2