fix: 6 verified bugs cherry-picked from PR #9#14

jrenaldi79 merged 2 commits intomainjrenaldi79/sidecar:mainfrom

fix/bug-fixes-from-pr9jrenaldi79/sidecar:fix/bug-fixes-from-pr9Copy head branch name to clipboard