diff --git a/core/build.sbt b/core/build.sbt
index 211aaf9b7e473..959e5644d18c3 100644
--- a/core/build.sbt
+++ b/core/build.sbt
@@ -11,7 +11,6 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
 
 libraryDependencies ++= Seq(
   "org.apache.zookeeper"  % "zookeeper"   % "3.3.4",
-  "com.github.sgroschupf" % "zkclient"    % "0.1",
   "org.xerial.snappy"     % "snappy-java" % "1.0.4.1",
   "org.easymock"          % "easymock"    % "3.0" % "test",
   "junit"                 % "junit"       % "4.1" % "test"
@@ -19,8 +18,9 @@ libraryDependencies ++= Seq(
 
 libraryDependencies <<= (scalaVersion, libraryDependencies) { (sv, deps) =>
   deps :+ (sv match {
-    case "2.8.0" => "org.scalatest" %  "scalatest" % "1.2" % "test"
-    case _       => "org.scalatest" %% "scalatest" % "1.8" % "test"
+    case "2.8.0" => "org.scalatest" %  "scalatest" % "1.2"   % "test"
+    case "2.9.2" => "org.scalatest" %% "scalatest" % "1.9.1" % "test"
+    case _       => "org.scalatest" %% "scalatest" % "1.8"   % "test"
   })
 }
 
diff --git a/core/lib/zkclient-20120522.jar b/core/lib/zkclient-20120522.jar
deleted file mode 100644
index 225e97e2160ac..0000000000000
Binary files a/core/lib/zkclient-20120522.jar and /dev/null differ
diff --git a/core/src/main/scala/kafka/producer/ConsoleProducer.scala b/core/src/main/scala/kafka/producer/ConsoleProducer.scala
index eebfda6ede3ae..9c2260b89fdfd 100644
--- a/core/src/main/scala/kafka/producer/ConsoleProducer.scala
+++ b/core/src/main/scala/kafka/producer/ConsoleProducer.scala
@@ -196,7 +196,7 @@ object ConsoleProducer {
       topic = props.getProperty("topic")
       if(props.containsKey("parse.key"))
         parseKey = props.getProperty("parse.key").trim.toLowerCase.equals("true")
-      if(props.containsKey("key.seperator"))
+      if(props.containsKey("key.separator"))
         keySeparator = props.getProperty("key.separator")
       if(props.containsKey("ignore.error"))
         ignoreError = props.getProperty("ignore.error").trim.toLowerCase.equals("true")
diff --git a/project/Build.scala b/project/Build.scala
index 4bbdfee904ac8..facca79af3145 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -34,7 +34,8 @@ object KafkaBuild extends Build {
     libraryDependencies ++= Seq(
       "log4j"                 % "log4j"        % "1.2.15",
       "net.sf.jopt-simple"    % "jopt-simple"  % "3.2",
-      "org.slf4j"             % "slf4j-simple" % "1.6.4"
+      "org.slf4j"             % "slf4j-simple" % "1.6.4",
+      "com.101tec"            % "zkclient"     % "0.2"
     ),
     // The issue is going from log4j 1.2.14 to 1.2.15, the developers added some features which required
     // some dependencies on various sun and javax packages.
@@ -100,9 +101,9 @@ object KafkaBuild extends Build {
   // POM Tweaking for core:
   def zkClientDep =
     <dependency>
-      <groupId>zkclient</groupId>
+      <groupId>com.101tec</groupId>
       <artifactId>zkclient</artifactId>
-      <version>20120522</version>
+      <version>0.2</version>
       <scope>compile</scope>
     </dependency>
 
@@ -116,7 +117,7 @@ object KafkaBuild extends Build {
       </dependency>
       <dependency>
         <groupId>com.yammer.metrics</groupId>
-        <artifactId>metrics-annotations</artifactId>
+        <artifactId>metrics-annotation</artifactId>
         <version>3.0.0-c0c8be71</version>
         <scope>compile</scope>
       </dependency>
diff --git a/project/build/KafkaProject.scala b/project/build/KafkaProject.scala
index fac723a6f2a00..1660fb88b9098 100644
--- a/project/build/KafkaProject.scala
+++ b/project/build/KafkaProject.scala
@@ -74,7 +74,7 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
       <dependency>
         <groupId>com.yammer.metrics</groupId>
         <artifactId>metrics-core</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-c0c8be71</version>
         <scope>compile</scope>
       </dependency>
 
@@ -82,7 +82,7 @@ class KafkaProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje
       <dependency>
         <groupId>com.yammer.metrics</groupId>
         <artifactId>metrics-annotation</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.0.0-c0c8be71</version>
         <scope>compile</scope>
       </dependency>
 
diff --git a/sbt b/sbt
index 9ffb03b7a8c2e..7fa3ea26e260e 100755
--- a/sbt
+++ b/sbt
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.