Some alignment changes