Make sure metadata gets shuffled around appropriately