diff --git a/CMakeLists.txt b/CMakeLists.txt
index b452a6a..7c4a9b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,25 +61,25 @@ set(default_cmake_args
 
 ExternalProject_Add(bot2-core
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-core
-  BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-core/pod-build
+  BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-core
   CMAKE_CACHE_ARGS ${default_cmake_args})
 checkbuild(bot2-core)
 
 ExternalProject_Add(bot2-procman
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-procman
-  BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-procman/pod-build
+  BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-procman
   CMAKE_CACHE_ARGS ${default_cmake_args})
 checkbuild(bot2-procman)
 
 ExternalProject_Add(bot2-lcm-utils
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils
-  BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcm-utils/pod-build
+  BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcm-utils
   CMAKE_CACHE_ARGS ${default_cmake_args})
 checkbuild(bot2-lcm-utils)
 
 ExternalProject_Add(bot2-param
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-param
-  BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-param/pod-build
+  BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-param
   CMAKE_CACHE_ARGS ${default_cmake_args}
   DEPENDS bot2-core)
 
@@ -90,13 +90,13 @@ if (WITH_BOT_VIS)
   set(bot2_vis_depends bot2-vis)
   ExternalProject_Add(bot2-vis
     SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-vis
-    BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-vis/pod-build
+    BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-vis
     CMAKE_CACHE_ARGS ${default_cmake_args}
     DEPENDS bot2-core)
 
   ExternalProject_Add(bot2-lcmgl
     SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl
-    BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build
+    BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl
     CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}
     DEPENDS bot2-vis)
 
@@ -106,16 +106,16 @@ else()
 
   ExternalProject_Add(bot2-lcmgl
     SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl
-    BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-lcmgl/pod-build
+    BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-lcmgl
     CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS})
 
 endif()
 
 ExternalProject_Add(bot2-frames
   SOURCE_DIR ${PROJECT_SOURCE_DIR}/bot2-frames
-  BINARY_DIR ${PROJECT_SOURCE_DIR}/bot2-frames/pod-build
+  BINARY_DIR ${PROJECT_BINARY_DIR}/bot2-frames
   CMAKE_CACHE_ARGS ${default_cmake_args} -DUSE_BOT_VIS:BOOL=${WITH_BOT_VIS}
   DEPENDS bot2-core bot2-param bot2-lcmgl ${bot2_vis_depends})
 
 # dummy install step
-install(FILES)
\ No newline at end of file
+install(CODE "message(\"Nothing to do for install.\")")
diff --git a/bot2-procman/python/src/bot_procman/sheriff.py b/bot2-procman/python/src/bot_procman/sheriff.py
index b796392..ec95975 100644
--- a/bot2-procman/python/src/bot_procman/sheriff.py
+++ b/bot2-procman/python/src/bot_procman/sheriff.py
@@ -322,8 +322,8 @@ def owns_command(self, cmd_object):
 
         @return True if this deputy object manages \p command, False if not.
         """
-        return command.sheriff_id in self._commands and \
-                self._commands [command.sheriff_id] is command
+        return cmd_object.sheriff_id in self._commands and \
+                self._commands [cmd_object.sheriff_id] is cmd_object
 
     def _update_from_deputy_info2(self, dep_info_msg):
         """
@@ -1042,8 +1042,8 @@ def schedule_command_for_removal(self, cmd):
         """
         if self._is_observer:
             raise ValueError("Can't remove commands in Observer mode")
-        deputy = self.get_command_deputy(command)
-        status_changes = deputy._schedule_for_removal(command)
+        deputy = self.get_command_deputy(cmd)
+        status_changes = deputy._schedule_for_removal(cmd)
         self._maybe_emit_status_change_signals(deputy, status_changes)
         self.send_orders()