New alignment fixes