Metadata fixes/cleanup