PackageConfig fixes (see #240)