diff --git a/src/PRDevice.cpp b/src/PRDevice.cpp
index 1cc02af..425b5c1 100644
--- a/src/PRDevice.cpp
+++ b/src/PRDevice.cpp
@@ -766,15 +766,18 @@ PRResult PRDevice::PRJTAGShiftTDOData(uint16_t numBits, bool_t dataBlockComplete
 
 PRResult PRDevice::PRJTAGReadTDIMemory(uint16_t tableOffset, uint16_t numWords, uint32_t * tdiData)
 {
-    ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_TDI_MEMORY_BASE_ADDR + tableOffset, numWords, tdiData);
+    return ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_TDI_MEMORY_BASE_ADDR + tableOffset, numWords, tdiData);
 }
 
 PRResult PRDevice::PRJTAGGetStatus(PRJTAGStatus * status)
 {
     uint32_t rdBuffer[1];
-    ReadDataRaw (P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_STATUS_REG_BASE_ADDR, 1, rdBuffer);
+	PRResult res = ReadDataRaw(P_ROC_BUS_JTAG_SELECT, P_ROC_JTAG_STATUS_REG_BASE_ADDR, 1, rdBuffer);
+	if (res == kPRFailure)
+		return res;
     status->commandComplete = rdBuffer[0] >> P_ROC_JTAG_STATUS_DONE_SHIFT;
     status->tdi = rdBuffer[0] >> P_ROC_JTAG_STATUS_TDI_SHIFT;
+	return res;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -1060,7 +1063,7 @@ int32_t PRDevice::ReadData(uint32_t *buffer, int32_t num_words)
 PRResult PRDevice::FlushReadBuffer()
 {
     int32_t numBytes,rc,k;
-    uint32_t rd_buffer[3];
+    //uint32_t rd_buffer[3];
     numBytes = CollectReadData();
     k = 0;
     //std::cout << "Flushing rd buffer of " << num_words << "words\n";
diff --git a/src/pinproc.cpp b/src/pinproc.cpp
index 95ebd40..2f0a8a3 100644
--- a/src/pinproc.cpp
+++ b/src/pinproc.cpp
@@ -51,7 +51,7 @@ void PRLog(PRLogLevel level, const char *format, ...)
     if (logCallback)
         logCallback(level, line);
     else
-        fprintf(stderr, line);
+        fprintf(stderr, "%s", line);
 }
 
 void PRLogSetCallback(PRLogCallback callback)