Multiple fixes for pkgs