[AC (pkgs)] Comint/shell fixes