diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee
index 089da885..b8c02d26 100644
--- a/assets/scripts/app/models/job.coffee
+++ b/assets/scripts/app/models/job.coffee
@@ -25,6 +25,14 @@ require 'travis/model'
 
   _config: DS.attr('object')
 
+  repoSlugDidChange: (->
+    if slug = @get('repoSlug')
+      @get('store').loadIncomplete(Travis.Repo, {
+        id: @get('repoId'),
+        slug: slug
+      }, { skipIfExists: true })
+  ).observes('repoSlug')
+
   log: ( ->
     @set('isLogAccessed', true)
     Travis.Log.create(job: this)
@@ -34,10 +42,6 @@ require 'travis/model'
     @get('repositorySlug')
   ).property('repositorySlug')
 
-  repoData: (->
-    { id: @get('repoId'), slug: @get('repoSlug') }
-  ).property('repoSlug', 'repoId')
-
   config: (->
     Travis.Helpers.compact(@get('_config'))
   ).property('_config')
diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee
index 34118023..2ebfa7ba 100644
--- a/assets/scripts/app/models/repo.coffee
+++ b/assets/scripts/app/models/repo.coffee
@@ -117,7 +117,7 @@ require 'travis/model'
     @find(search: query, orderBy: 'name')
 
   withLastBuild: ->
-    @filter( (repo) -> repo.get('lastBuildId') )
+    @filter( (repo) -> !repo.get('incomplete') && repo.get('lastBuildId') )
 
   bySlug: (slug) ->
     repo = $.select(@find().toArray(), (repo) -> repo.get('slug') == slug)
diff --git a/assets/scripts/app/models/worker.coffee b/assets/scripts/app/models/worker.coffee
index 737bf113..c60a898f 100644
--- a/assets/scripts/app/models/worker.coffee
+++ b/assets/scripts/app/models/worker.coffee
@@ -26,11 +26,15 @@ require 'travis/model'
     @get('payload.job.number')
   ).property('jobNumber')
 
-  repoData: (->
-    { id: @get('repoId'), slug: @get('repoSlug') }
-  ).property('repoSlug', 'repoId')
-
   repo: (->
+    id = @get('payload.repository.id') || @get('payload.repo.id')
+    slug = @get('repoSlug')
+
+    @get('store').loadIncomplete(Travis.Repo, {
+      id: id,
+      slug: slug
+    }, { skipIfExists: true })
+
     Travis.Repo.find(@get('payload.repository.id') || @get('payload.repo.id'))
   ).property('payload.repository.id', 'payload.repo.id')
 
diff --git a/assets/scripts/app/templates/jobs/running/group.hbs b/assets/scripts/app/templates/jobs/running/group.hbs
index ffe27567..3de15f49 100644
--- a/assets/scripts/app/templates/jobs/running/group.hbs
+++ b/assets/scripts/app/templates/jobs/running/group.hbs
@@ -5,8 +5,8 @@
 <ul class="jobs">
   {{#each job in sortedJobs}}
     <li class="job">
-      {{#if job.repoData.slug}}
-        {{#linkTo "job" job.repoData job}}
+      {{#if job.repo.slug}}
+        {{#linkTo "job" job.repo job}}
           #{{job.number}}
         {{/linkTo}}
       {{/if}}
diff --git a/assets/scripts/app/templates/queues/list.hbs b/assets/scripts/app/templates/queues/list.hbs
index 2b19a905..8a9203af 100644
--- a/assets/scripts/app/templates/queues/list.hbs
+++ b/assets/scripts/app/templates/queues/list.hbs
@@ -5,10 +5,10 @@
     <ul {{bindAttr id="queue.id"}}>
       {{#each job in queue}}
         {{#view Travis.QueueItemView jobBinding="job"}}
-          {{#if job.repoSlug}}
-            {{#linkTo "job" job.repoData job}}
+          {{#if job.repo.slug}}
+            {{#linkTo "job" job.repo job}}
               <span class="slug">
-                {{job.repoSlug}}
+                {{job.repo.slug}}
               </span>
               #{{job.number}}
             {{/linkTo}}
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs
index c9b777e6..c99cacc4 100644
--- a/assets/scripts/app/templates/workers/list.hbs
+++ b/assets/scripts/app/templates/workers/list.hbs
@@ -14,7 +14,7 @@
                 <div class="status"></div>
                 {{#if worker.isWorking}}
                   {{#if worker.jobId}}
-                    {{#linkTo "job" worker.repoData worker.jobId}}
+                    {{#linkTo "job" worker.repo worker.jobId}}
                       {{view.display}}
                     {{/linkTo}}
                   {{/if}}