diff --git a/buildbot/cbuildbot_commands.py b/buildbot/cbuildbot_commands.py
index 04729ba..6e030e9 100644
--- a/buildbot/cbuildbot_commands.py
+++ b/buildbot/cbuildbot_commands.py
@@ -60,8 +60,8 @@
            '-c',
            'git',
            'config',
-           'url.ssh://git@gitrw.chromium.org:9222.insteadof',
-           'http://git.chromium.org/git'
+           'url.ssh://gerrit.chromium.org:29418.insteadof',
+           'http://git.chromium.org'
           ], cwd=buildroot)
       retries = 0
     except:
diff --git a/buildbot/cros_mark_as_stable.py b/buildbot/cros_mark_as_stable.py
index b56195c..3424655 100755
--- a/buildbot/cros_mark_as_stable.py
+++ b/buildbot/cros_mark_as_stable.py
@@ -367,7 +367,8 @@
     # NOTE: chromeos-kernel has the wrong project name, so it fails this
     # check.
     # TODO(davidjames): Fix the project name in the chromeos-kernel ebuild.
-    cmd = 'cd %s && git config --get remote.cros.projectname' % srcdir
+    cmd = ('cd %s && ( git config --get remote.cros.projectname || '
+           'git config --get remote.cros-internal.projectname )') % srcdir
     actual_project = _SimpleRunCommand(cmd).rstrip()
     if project not in (actual_project, 'chromeos-kernel'):
       Die('Project name mismatch for %s (%s != %s)' % (unstable_ebuild, project,
diff --git a/buildbot/cros_mark_chrome_as_stable.py b/buildbot/cros_mark_chrome_as_stable.py
index 4354221..c5298d7 100755
--- a/buildbot/cros_mark_chrome_as_stable.py
+++ b/buildbot/cros_mark_chrome_as_stable.py
@@ -351,9 +351,10 @@
   else:
     Info('No stable candidate found.')
 
+  tracking_branch = 'remotes/m/%s' % os.path.basename(options.tracking_branch)
   os.chdir(overlay_dir)
   work_branch = cros_mark_as_stable.GitBranch(
-      cros_mark_as_stable.STABLE_BRANCH_NAME, options.tracking_branch)
+      cros_mark_as_stable.STABLE_BRANCH_NAME, tracking_branch)
   work_branch.CreateBranch()
   chrome_version_atom = MarkChromeEBuildAsStable(
       stable_candidate, unstable_ebuild, chrome_rev, version_to_uprev,