Minor alignment fixes