Port two more fixes#5162

mmitche merged 2 commits into

release/3.xdotnet/arcade:release/3.xfrom

port-two-fixesdotnet/arcade:port-two-fixesCopy head branch name to clipboard