Some fixes per the CPANTS