Make alignment more self-consistent