Fixes for [rt.cpan.org #97309]