more 10.5 perl 5.16 fixes