diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 21f19d9bc..dbc9690c5 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -607,7 +607,7 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
 // prepare a waveform pattern in the buffer based on the ID given then
 // simulate a FSK tag until the button is pressed
 // arg1 contains fcHigh and fcLow, arg2 contains invert and clock
-void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
+void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *bits)
 {
 	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
@@ -625,7 +625,7 @@ void CmdFSKsimTAG(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 
 	for (i=0; i<size; i++){
 		
-		if (BitStream[i] == invert)
+		if (bits[i] == invert)
 			fcAll(fcLow, &n, clk, &modCnt);
 		else
 			fcAll(fcHigh, &n, clk, &modCnt);
diff --git a/client/Makefile b/client/Makefile
index 9710c411c..4672a3828 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -80,6 +80,7 @@ POSTCOMPILE = $(MV) -f $(OBJDIR)/$*.Td $(OBJDIR)/$*.d
 
 CORESRCS =  uart_posix.c \
 			uart_win32.c \
+			ui.c \
 			util.c \
 			util_posix.c \
 			scandir.c
@@ -105,7 +106,6 @@ CMDSRCS =	crapto1/crapto1.c \
 			iso15693tools.c \
 			data.c \
 			graph.c \
-			ui.c \
 			cmddata.c \
 			lfdemod.c \
 			cmdanalyse.c \
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 41dfe8450..3b9d72bf0 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -27,7 +27,7 @@
 #include "whereami.h"
 
 // a global mutex to prevent interlaced printing from different threads
-pthread_mutex_t print_lock;
+extern pthread_mutex_t print_lock;
 
 static serial_port sp;
 static UsbCommand txcmd;