Fix more Perl 5.17 failing test and warnings