PackageConfig fixes

See #240 for background