Alignment and other changes