Make installer smarter and Perl Critic -4 happy