merged metadata fixes