Fixes for v0.06 (Perl 5.12+ compatibility)