diff --git a/buildman/buildcomponent.py b/buildman/buildcomponent.py
index 59c07042c..f47de4022 100644
--- a/buildman/buildcomponent.py
+++ b/buildman/buildcomponent.py
@@ -274,17 +274,18 @@ class BuildComponent(BaseComponent):
     # Set the component back to a running state.
     self._set_status(ComponentStatus.RUNNING)
 
+  @staticmethod
   def _ping():
     """ Ping pong. """
     return 'pong'
 
   def _on_ready(self, token):
     if self._component_status != 'waiting':
-      LOGGER.warning('Build component with token %s is already connected', self.expected_token)
+      LOGGER.warning('Build component (token "%s") is already connected', self.expected_token)
       return
 
     if token != self.expected_token:
-      LOGGER.warning('Builder token mismatch. Expected: %s. Found: %s', self.expected_token, token)
+      LOGGER.warning('Builder token mismatch. Expected: "%s". Found: "%s"', self.expected_token, token)
       return
 
     self._set_status(ComponentStatus.RUNNING)
@@ -339,7 +340,7 @@ class BuildComponent(BaseComponent):
 
   def _timeout(self):
     self._set_status(ComponentStatus.TIMED_OUT)
-    LOGGER.warning('Build component %s timed out', self.expected_token)
+    LOGGER.warning('Build component (token "%s") timed out', self.expected_token)
     self._dispose(timed_out=True)
 
   def _dispose(self, timed_out=False):
diff --git a/local-run.sh b/local-run.sh
index 628873fd7..d606624a7 100755
--- a/local-run.sh
+++ b/local-run.sh
@@ -1 +1 @@
-gunicorn -c conf/gunicorn_local.py application:application
\ No newline at end of file
+gunicorn -c conf/gunicorn_local.py application:application
\ No newline at end of file
diff --git a/local-test.sh b/local-test.sh
index c5cb9e283..a54491969 100755
--- a/local-test.sh
+++ b/local-test.sh
@@ -1,2 +1 @@
-#!/bin/sh
 TEST=true python -m unittest discover