Bug fixes for github-branch-switching feature