More alignment fixes...