More Perl::Critic fixes
More Perl::Critic fixes
More Perl::Critic fixes
Merge pull request #1326 from szabgab/szabgab/perl-critic

More Perl::Critic fixes