More alignment fixes.