Updates to fix CPAN testers fails