Packages: adjust some packages