Fixes for doing multiple alignments