Build.PL fixes