Some more hardening when having a network installation. Fixes #15