Makefile.PL fixes