Fixes for perl 5.18.0