Changes for CPAN upload