small fixes to please perl::critic