Alignment fixes