Make alignments more robust