Few more fixes to make method signatures work for Perl