alignment fixes