Fix handling of defaultpkg