diff --git a/.gitignore b/.gitignore
index 39d98dfbe..a04f35f72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,21 @@
-*.komodoproject
-*.kpf
-*.sqlite*
-*.sw*
-.DS_Store
-.tidyall.d
 /MYMETA.*
 /Makefile
 /Makefile.old
 /blib
 /cover_db/
-/etc/metacpan_local.pl
 /local/
 /log4perl_local.conf
 /metacpan_server_local.conf
 /perltidy.LOG
 /pm_to_blib
+/var
+/etc/metacpan_local.pl
 /t/var/darkpan/
 /t/var/log/
 /t/var/tmp/
-/var
+*.komodoproject
+*.kpf
+*.sqlite*
+*.sw*
+.DS_Store
+.tidyall.d
diff --git a/.perlcriticrc b/.perlcriticrc
index e327481e4..2b6db72b5 100644
--- a/.perlcriticrc
+++ b/.perlcriticrc
@@ -5,7 +5,6 @@ verbose = 11
 theme = core
 
 [-ControlStructures::ProhibitPostfixControls]
-[-Documentation::RequirePodLinksIncludeText]
 [-Documentation::RequirePodSections]
 [-InputOutput::ProhibitInteractiveTest]
 [-Modules::RequireVersionVar]
@@ -13,8 +12,8 @@ theme = core
 [-RegularExpressions::RequireExtendedFormatting]
 [-RegularExpressions::RequireLineBoundaryMatching]
 [-Subroutines::ProhibitExplicitReturnUndef]
+[-TestingAndDebugging::ProhibitNoStrict]
 [-ValuesAndExpressions::ProhibitNoisyQuotes]
-[-ValuesAndExpressions::ProhibitAccessOfPrivateData]
 [-Variables::ProhibitPunctuationVars]
 
 [CodeLayout::RequireTrailingCommas]
diff --git a/bin/convert_authors.pl b/bin/convert_authors.pl
old mode 100644
new mode 100755
index adaa5a0e6..573e3f75b
--- a/bin/convert_authors.pl
+++ b/bin/convert_authors.pl
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
 # PODNAME: foo
 
 use strict;
diff --git a/bin/mirror_cpan_for_developers.pl b/bin/mirror_cpan_for_developers.pl
old mode 100644
new mode 100755
index 6b42f9d89..865b77cb5
--- a/bin/mirror_cpan_for_developers.pl
+++ b/bin/mirror_cpan_for_developers.pl
@@ -1,3 +1,4 @@
+#!/usr/bin/env perl
 # This script is only needed if you are developing metacpan,
 # on the live servers we use File::Rsync::Mirror::Recent
 # https://github.com/metacpan/metacpan-puppet/tree/master/modules/rrrclient
diff --git a/bin/unlisted_prereqs.pl b/bin/unlisted_prereqs.pl
old mode 100644
new mode 100755
index 8ab857aaf..bc94996da
--- a/bin/unlisted_prereqs.pl
+++ b/bin/unlisted_prereqs.pl
@@ -5,10 +5,10 @@
 
 use strict;
 use warnings;
-use Perl::PrereqScanner 1.014;
-use CPAN::Meta::Requirements ();
-use File::Find::Rule::Perl;
-use List::Util qw( sum );
+use Perl::PrereqScanner 1.014 ();
+use CPAN::Meta::Requirements  ();
+use File::Find::Rule::Perl    ();
+use List::Util                qw( sum );
 use version 0.77;
 
 # TODO: use CPAN::Meta::Prereqs
diff --git a/etc/metacpan.pl b/etc/metacpan.pl
index 23f63d77b..827f1e99f 100644
--- a/etc/metacpan.pl
+++ b/etc/metacpan.pl
@@ -1,6 +1,6 @@
 # do not edit this file
 # create etc/metacpan_local.pl instead
-use FindBin;
+use FindBin ();
 
 {
     # ElasticSearch instance, can be either a single server
diff --git a/improve-search-results/.gitignore b/improve-search-results/.gitignore
index 3f12605e2..3374723e1 100644
--- a/improve-search-results/.gitignore
+++ b/improve-search-results/.gitignore
@@ -1,2 +1,2 @@
-# carton/local::lib
 /local/
+# carton/local::lib
diff --git a/lib/MetaCPAN/Server/Controller/Login.pm b/lib/MetaCPAN/Server/Controller/Login.pm
index d4e5602f7..df13611f8 100644
--- a/lib/MetaCPAN/Server/Controller/Login.pm
+++ b/lib/MetaCPAN/Server/Controller/Login.pm
@@ -29,7 +29,7 @@ sub auto : Private {
 sub index : Path {
     my ( $self, $c ) = @_;
     my @login = map { "<li><a href=\"/login/" . lc($_) . "\">$_</a></li>" }
-        sort grep {s/^Login:://} $c->controllers;
+        sort map /^Login::(.*)/, $c->controllers;
     $c->res->content_type('text/html');
     $c->res->body(qq{<pre><h1>Login via</h1><ul>@login</ul></pre>});
 }
diff --git a/perlimports.toml b/perlimports.toml
index 0e2e3aba1..f5ed6d190 100644
--- a/perlimports.toml
+++ b/perlimports.toml
@@ -10,7 +10,7 @@
 # preserve_unused disabled.
 
 cache                           = false # setting this to true is currently discouraged
-ignore_modules                  = ["Catalyst::Runtime","Module::Pluggable", "namespace::clean", "Test::More", "Type::Library", "With::Roles"]
+ignore_modules                  = ["Catalyst::Runtime","Module::Pluggable", "namespace::clean", "Test::More", "Type::Library", "With::Roles", "File::Find::Rule::Perl"]
 ignore_modules_filename         = ""
 ignore_modules_pattern          = "" # regex like "^(Foo|Foo::Bar)"
 ignore_modules_pattern_filename = ""
diff --git a/t/lib/MetaCPAN/Server/Test.pm b/t/lib/MetaCPAN/Server/Test.pm
index 4ba5fb882..ea3d77aa0 100644
--- a/t/lib/MetaCPAN/Server/Test.pm
+++ b/t/lib/MetaCPAN/Server/Test.pm
@@ -3,9 +3,9 @@ package MetaCPAN::Server::Test;
 use strict;
 use warnings;
 
-use HTTP::Request::Common qw( DELETE GET POST );
+use HTTP::Request::Common qw( DELETE GET POST );    ## no perlimports
 use MetaCPAN::Server      ();
-use Plack::Test           qw( test_psgi );
+use Plack::Test           qw( test_psgi );          ## no perlimports
 use Test::More;
 
 use base 'Exporter';
diff --git a/tidyall.ini b/tidyall.ini
index 60038002a..b27c1fd9d 100644
--- a/tidyall.ini
+++ b/tidyall.ini
@@ -60,8 +60,5 @@ ignore = lib/MetaCPAN/Server/View/Pod.pm
 ignore = lib/MetaCPAN/Util.pm
 ignore = lib/Plack/Session/Store/ElasticSearch.pm
 
-[SortLines]
-select = .gitignore
-
 [UniqueLines]
 select = .gitignore