Alignments and other fixes