A number of fixes to the metagenomics protocol

@SherineAwad, could you please look over and merge if appropriate?