Various bugfixes from the CPAN RT backlog