diff --git a/scripts/common.m4 b/scripts/common.m4
index 3dd48d9e..dbf417e3 100644
--- a/scripts/common.m4
+++ b/scripts/common.m4
@@ -119,8 +119,8 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
   ])
 ])
 
-AC_DEFUN([TORRENT_CHECK_ALIGN], [
-  AC_MSG_CHECKING(byte alignment)
+AC_DEFUN([TORRENT_CHECK_ALIGNED], [
+  AC_MSG_CHECKING(the byte alignment)
 
   AC_RUN_IFELSE(
     [[#include <inttypes.h>
@@ -133,9 +133,9 @@ AC_DEFUN([TORRENT_CHECK_ALIGN], [
 	}
     ]],
     [
-      AC_MSG_RESULT(none)
+      AC_MSG_RESULT(none needed)
     ], [
-      AC_DEFINE(USE_ALIGN, 1, Require byte alignment)
+      AC_DEFINE(USE_ALIGNED, 1, Require byte alignment)
       AC_MSG_RESULT(required)
   ])
 ])
diff --git a/src/main.cc b/src/main.cc
index 84848af6..3cb31093 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -232,8 +232,6 @@ main(int argc, char** argv) {
 	  utils::displayScheduler.get_next_timeout() <= utils::Timer::cache())
 	uiControl.get_display().do_update();
 
-      //utils::Timer::update();
-
       // Do shutdown check before poll, not after.
       uiControl.get_core().get_poll_manager()->poll(!utils::taskScheduler.empty() ?
 						    utils::taskScheduler.get_next_timeout() - utils::Timer::cache() :
diff --git a/src/signal_handler.cc b/src/signal_handler.cc
index 4cb4ed36..665c9d98 100644
--- a/src/signal_handler.cc
+++ b/src/signal_handler.cc
@@ -107,6 +107,8 @@ SignalHandler::as_string(unsigned int signum) {
     return "Timer signal";
   case SIGTERM:
     return "Termination signal";
+  case SIGBUS:
+    return "Bus error";
   default:
     return "Unlisted";
   }