More npinit mods.