a few additional alignment fixes