more alignment fixes