Fix Alignment changes