Fix some things that Perl::Critic complained about