Some alignment fixes.