More fixes to get this on CPAN