diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 6cd3ec64..4d063238 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -319,7 +319,7 @@ void ObjectFactory::produce(){
     Max31865PT1000Handler* rtdIc16 = new Max31865PT1000Handler(objects::RTD_IC16, objects::SPI_COM_IF, spiRtdIc16, 0);
     Max31865PT1000Handler* rtdIc17 = new Max31865PT1000Handler(objects::RTD_IC17, objects::SPI_COM_IF, spiRtdIc17, 0);
     Max31865PT1000Handler* rtdIc18 = new Max31865PT1000Handler(objects::RTD_IC18, objects::SPI_COM_IF, spiRtdIc18, 0);
-    rtdIc10->setStartUpImmediately();
+//    rtdIc10->setStartUpImmediately();
 //    rtdIc4->setStartUpImmediately();
 
     I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE,
diff --git a/mission/devices/IMTQHandler.cpp b/mission/devices/IMTQHandler.cpp
index cc740409..88fd00ba 100644
--- a/mission/devices/IMTQHandler.cpp
+++ b/mission/devices/IMTQHandler.cpp
@@ -18,7 +18,8 @@ IMTQHandler::~IMTQHandler() {
 
 void IMTQHandler::doStartUp(){
 	if(mode == _MODE_START_UP){
-		setMode(MODE_ON);
+	    //TODO: Set to MODE_ON again
+		setMode(MODE_NORMAL);
 	}
 }
 
@@ -44,6 +45,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(
 	case(IMTQ::GET_ENG_HK_DATA): {
 	    commandBuffer[0] = IMTQ::CC::GET_ENG_HK_DATA;
 		rawPacket = commandBuffer;
+		rawPacketLen = 1;
 		return RETURN_OK;
 	}
 	case(IMTQ::START_ACTUATION_DIPOLE): {
@@ -58,6 +60,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(
 	    commandBuffer[7] = *(commandData + 7);
 	    commandBuffer[8] = *(commandData + 6);
 		rawPacket = commandBuffer;
+		rawPacketLen = 9;
 		return RETURN_OK;
 	}
 	default:
diff --git a/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h b/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
index 21ad7dec..23ff8b9a 100644
--- a/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
+++ b/mission/devices/devicedefinitions/IMTQHandlerDefinitions.h
@@ -18,7 +18,7 @@ namespace IMTQ {
 	static const uint8_t MAX_REPLY_SIZE = SIZE_ENG_HK_DATA_REPLY;
 	static const uint8_t MAX_COMMAND_SIZE = 9;
 
-	static const uint8_t POOL_ENTRIES = 8;
+	static const uint8_t POOL_ENTRIES = 11;
 
 	/**
 	 * Command code definitions. Each command or reply of an IMTQ request will begin with one of