diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt
index becf837..0ea921a 100644
--- a/FlippR-Driver/CMakeLists.txt
+++ b/FlippR-Driver/CMakeLists.txt
@@ -21,12 +21,6 @@ ENDIF()
 
 project(FlippR-Driver)
 
-################### CROSS_COMPILING ######################
-IF(NOT RPI_ROOT)
-    set(RPI_ROOT $ENV{HOME}/FlippR/rpi)
-    set(RPI_TOOLCHAIN ${RPI_ROOT}/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin)
-ENDIF()
-
 ###################### START_CMAKE #######################
 cmake_minimum_required(VERSION 3.0.1)
 project(FlippR-Driver VERSION 0.1.0)# LANGUAGES CXX)
@@ -80,7 +74,7 @@ if(Boost_FOUND)
   target_include_directories(${PROJECT_NAME} PUBLIC ${Boost_INCLUDE_DIRS})
   LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
   target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
-  message ("Boost found and linked.")
+  message ("Boost found and linked at ${Boost_INCLUDE_DIRS}")
 else()
     message (FATAL_ERROR "Can't find Boost.")
 endif(Boost_FOUND)
diff --git a/FlippR-Driver/networking/input/InputSocketHandler.cpp b/FlippR-Driver/networking/input/InputSocketHandler.cpp
index 64915fb..1acbe74 100644
--- a/FlippR-Driver/networking/input/InputSocketHandler.cpp
+++ b/FlippR-Driver/networking/input/InputSocketHandler.cpp
@@ -29,7 +29,7 @@ InputSocketHandler::InputSocketHandler(StreamSocket streamSocket, std::shared_pt
 
 void InputSocketHandler::run()
 {
-  while(true)
+  while(this->socket().poll(100, Poco::Net::Socket::SelectMode::SELECT_ERROR))
   {
     Event event = this->queue.pop();