Fixed job recovery after pairwise alignment stage, and minor tweaks