More alignment changes