diff --git a/README.md b/README.md
index d0cdde9..ec80083 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ This is for 'core', 'perf', 'contrib:hadoop-consumer', 'contrib:hadoop-producer'
 ### Publishing the jar for all version of Scala and for all projects to maven ###
     ./gradlew uploadArchivesAll
 
-Please note for this to work you should create/update `~/.gradle/gradle.properties` and assign the following variables
+Please note for this to work you need to create/update `~/.gradle/gradle.properties` and assign the following variables
 
     mavenUrl=
     mavenUsername=
diff --git a/core/src/main/scala/kafka/controller/KafkaController.scala b/core/src/main/scala/kafka/controller/KafkaController.scala
index 8acd076..00a1f98 100644
--- a/core/src/main/scala/kafka/controller/KafkaController.scala
+++ b/core/src/main/scala/kafka/controller/KafkaController.scala
@@ -335,7 +335,8 @@ class KafkaController(val config : KafkaConfig, zkClient: ZkClient) extends Logg
    */
   def onControllerResignation() {
     inLock(controllerContext.controllerLock) {
-      autoRebalanceScheduler.shutdown()
+      if (config.autoLeaderRebalanceEnable)
+        autoRebalanceScheduler.shutdown()
       deleteTopicManager.shutdown()
       Utils.unregisterMBean(KafkaController.MBeanName)
       partitionStateMachine.shutdown()
diff --git a/core/src/main/scala/kafka/utils/ZkUtils.scala b/core/src/main/scala/kafka/utils/ZkUtils.scala
index fa86bb9..f8e798b 100644
--- a/core/src/main/scala/kafka/utils/ZkUtils.scala
+++ b/core/src/main/scala/kafka/utils/ZkUtils.scala
@@ -101,7 +101,7 @@ object ZkUtils extends Logging {
   }
   
   def setupCommonPaths(zkClient: ZkClient) {
-    for(path <- Seq(ConsumersPath, BrokerIdsPath, BrokerTopicsPath, TopicConfigChangesPath, TopicConfigPath))
+    for(path <- Seq(ConsumersPath, BrokerIdsPath, BrokerTopicsPath, TopicConfigChangesPath, TopicConfigPath, DeleteTopicsPath))
       makeSurePersistentPathExists(zkClient, path)
   }
 
diff --git a/gradle.properties b/gradle.properties
index 4827769..447ee44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,3 @@ version=0.8.1
 scalaVersion=2.8.0
 task=build
 
-mavenUrl=
-mavenUsername=
-mavenPassword=