More OSX 10.5/perl5.16 fixes