Further npinit adjustments.