Some pkgs.lib -> lib fixes