Fixed declarations of packages.