Fix bugs from rt.cpan.org