more more alignment fixes