Metadata copypasta fixes