Fixing issues with Perl 5.16