Better prep for CPAN