Better support for multiple perl versions