A few alignement tweaks.