diff --git a/slider-agent/src/main/python/agent/Controller.py b/slider-agent/src/main/python/agent/Controller.py
index db0205f..a3e75a4 100644
--- a/slider-agent/src/main/python/agent/Controller.py
+++ b/slider-agent/src/main/python/agent/Controller.py
@@ -632,7 +632,7 @@
       # Process callbacks
       for callback in self.registration_listeners:
         callback()
-      time.sleep(self.netutil.HEARTBEAT_IDDLE_INTERVAL_SEC)
+      time.sleep(self.netutil.HEARTBEAT_START_DELAY_SEC)
       self.heartbeatWithServer()
     logger.info("Controller stopped heartbeating.")
 
diff --git a/slider-agent/src/main/python/agent/NetUtil.py b/slider-agent/src/main/python/agent/NetUtil.py
index 88c129a..11a0002 100644
--- a/slider-agent/src/main/python/agent/NetUtil.py
+++ b/slider-agent/src/main/python/agent/NetUtil.py
@@ -26,7 +26,8 @@
 class NetUtil:
 
   CONNECT_SERVER_RETRY_INTERVAL_SEC = 10
-  HEARTBEAT_IDDLE_INTERVAL_SEC = 10
+  HEARTBEAT_IDDLE_INTERVAL_SEC = 1
+  HEARTBEAT_START_DELAY_SEC = 0.01
   MINIMUM_INTERVAL_BETWEEN_HEARTBEATS = 0.1
 
   # For testing purposes
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index b5428be..1b191a7 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1588,7 +1588,7 @@
     log.info("Deleting package {} at {}.", actionPackageArgs.name, pkgPath);
 
     if(fs.delete(pkgPath, true)) {
-      log.info("Deleted package {} " + actionPackageArgs.name);
+      log.info("Deleted package {} ", actionPackageArgs.name);
       return EXIT_SUCCESS;
     } else {
       log.warn("Package deletion failed.");