More alignment fixes