Fix support for packages.