Additional fixes for Perl