more minor alignment fixes