diff --git a/lib/NGCP/Panel/Form/CallListSuppression/SuppressionAPI.pm b/lib/NGCP/Panel/Form/CallListSuppression/SuppressionAPI.pm
index 587bb59d3a..b7d14c8190 100644
--- a/lib/NGCP/Panel/Form/CallListSuppression/SuppressionAPI.pm
+++ b/lib/NGCP/Panel/Form/CallListSuppression/SuppressionAPI.pm
@@ -1,4 +1,4 @@
-package NGCP::Panel::Form::CallListSuppression::Suppression;
+package NGCP::Panel::Form::CallListSuppression::SuppressionAPI;
 
 use HTML::FormHandler::Moose;
 extends 'HTML::FormHandler';
diff --git a/lib/NGCP/Panel/Utils/DialogicImg.pm b/lib/NGCP/Panel/Utils/DialogicImg.pm
index eb609f61c4..9434c42bd4 100644
--- a/lib/NGCP/Panel/Utils/DialogicImg.pm
+++ b/lib/NGCP/Panel/Utils/DialogicImg.pm
@@ -1,5 +1,8 @@
+package NGCP::Panel::Utils::DialogicImg;
+
 use strict;
 use warnings;
+
 {
     package My::Serializer::Custom;
     use Moo;
@@ -42,8 +45,6 @@ use warnings;
     };
 }
 
-package NGCP::Panel::Utils::DialogicImg;
-
 use Moo;
 use Digest::MD5 qw/md5_hex/;
 use HTTP::Tiny;
diff --git a/sandbox/billing_mapping_effective_date.t b/sandbox/billing_mapping_effective_date.t
index 1af09c493e..d0764d8ef9 100644
--- a/sandbox/billing_mapping_effective_date.t
+++ b/sandbox/billing_mapping_effective_date.t
@@ -10,11 +10,9 @@ use Tie::IxHash;
 # try using the db directly ...
 my $schema = undef;
 
-eval <<'EVALLINE' ;
-    use lib "/home/rkrenn/sipwise/git/ngcp-schema/lib";
-    use lib "/home/rkrenn/sipwise/git/sipwise-base/lib";
-    use NGCP::Schema;
-EVALLINE
+eval 'use lib "/home/rkrenn/sipwise/git/ngcp-schema/lib";';
+eval 'use lib "/home/rkrenn/sipwise/git/sipwise-base/lib";';
+eval 'use NGCP::Schema;';
 
 print $@;
 unless ($@) {
diff --git a/sandbox/tracemem.pm b/sandbox/tracemem.pm
index cf7c7edacd..d8a3c95734 100644
--- a/sandbox/tracemem.pm
+++ b/sandbox/tracemem.pm
@@ -1,5 +1,5 @@
 
-## no critic (RequireUseWarnings, RequireUseStrict)
+## no critic (RequireUseWarnings, RequireUseStrict, RequireExplicitPackage)
 our $old = 0;
 BEGIN {
     unshift @INC, sub {
diff --git a/share/tools/generate_invoices.pl b/share/tools/generate_invoices.pl
index 56b407ea73..8acaf0e529 100755
--- a/share/tools/generate_invoices.pl
+++ b/share/tools/generate_invoices.pl
@@ -60,10 +60,15 @@ my @opt_spec = (
                 }
             }else{#takes value
                 if($opt_spec->{$key} =~/i\@$/){
-#                    $val ="1,5,10..13,4";
-                    $val=~s/-/../g;
+                    # $val = "1,5,10-13,4";
                     my @vals;
-                    eval "\@vals = ($val);";
+                    for my $range (split /,/, $val) {
+                        if ( my ($start, $end) = ($range =~ m/([0-9]+)-([0-9]+)/) ) {
+                            push @vals, ($start .. $end);
+                        } else {
+                            push @vals, $range;
+                        }
+                    }
                     $res = " --$key=".join(" --$key=", @vals);
                 }else{
                     $res = " --$key=$val ";
diff --git a/t/api-rest/api-journals.t b/t/api-rest/api-journals.t
index a92cc064e4..9291b63524 100644
--- a/t/api-rest/api-journals.t
+++ b/t/api-rest/api-journals.t
@@ -1,4 +1,5 @@
-#use Sipwise::Base;
+## no critic (RequireUseStrict, RequireUseWarnings)
+
 use Net::Domain qw(hostfqdn);
 use JSON -support_by_pp, -no_export;
 use Test::More;
diff --git a/t/lib/Selenium/Remote/Driver/Extensions.pm b/t/lib/Selenium/Remote/Driver/Extensions.pm
index 82441b239a..c8ced8527b 100644
--- a/t/lib/Selenium/Remote/Driver/Extensions.pm
+++ b/t/lib/Selenium/Remote/Driver/Extensions.pm
@@ -6,6 +6,9 @@ use Test::More import => [qw(diag ok is)];
 use MooseX::Method::Signatures;
 extends 'Selenium::Remote::Driver';
 
+## no critic (RequireEndWithOne)
+# false positive (probably due to parsing Method Signatures)
+
 sub BUILD {
     my $self = shift;
 
diff --git a/tools_bin/create_testusers.pl b/tools_bin/create_testusers.pl
index de4dc6ae55..4fe1d2fe4a 100755
--- a/tools_bin/create_testusers.pl
+++ b/tools_bin/create_testusers.pl
@@ -79,7 +79,7 @@ say "   sip-password=$password";
 say "   number-cc=$number_cc";
 say "   number-ac=$number_ac";
 print "Proceed <YES|no>: ";
-my $confirm = <STDIN>;
+my $confirm = <STDIN>;  ## no critic (ProhibitExplicitStdin)
 chomp $confirm;
 if($confirm eq "" || lc($confirm) eq "yes") {
     say "Proceeding as requested.";