Fix a couple of problems and add more stuff to Packages