Packages: fixed several bugs that could cause duplicate Package entries