diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index f3703c53cf..db5c71167b 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -215,10 +215,9 @@ abstract class MessageDispatcher(val prerequisites: DispatcherPrerequisites) ext
   @volatile private[this] var _shutdownScheduleDoNotCallMeDirectly: Int = _ // DO NOT TOUCH!
 
   @tailrec private final def addInhabitants(add: Long): Long = {
-    val u = Unsafe.instance
-    val c = u.getLongVolatile(this, inhabitantsOffset)
+    val c = inhabitants
     val r = c + add
-    if (u.compareAndSwapLong(this, inhabitantsOffset, c, r)) r else addInhabitants(add)
+    if (Unsafe.instance.compareAndSwapLong(this, inhabitantsOffset, c, r)) r else addInhabitants(add)
   }
 
   final def inhabitants: Long = Unsafe.instance.getLongVolatile(this, inhabitantsOffset)
diff --git a/project/Publish.scala b/project/Publish.scala
index ec097bbab7..dae0466f82 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -42,7 +42,7 @@ object Publish {
       <connection>scm:git:git@github.com:akka/akka.git</connection>
     </scm>) ++ makeDevelopersXml(Map(
         "jboner" -> "Jonas Boner",
-        "legendofklang" -> "Viktor Klang",
+        "viktorklang" -> "Viktor Klang",
         "rkuhn" -> "Roland Kuhn",
         "pvlugter" -> "Peter Vlugter"
         // TODO - More than the names in the last 10 commits