First work on getting installation back
Harden last change against hypothetical segfaults :)
Make mods install.