Fixes for running under perl 5.8.