Fixes for spades and bowtie2