Some alignment fixes