diff --git a/Firmware/Chameleon-Mini/Application/EM4233.c b/Firmware/Chameleon-Mini/Application/EM4233.c
index 79407a1..4fa98b3 100644
--- a/Firmware/Chameleon-Mini/Application/EM4233.c
+++ b/Firmware/Chameleon-Mini/Application/EM4233.c
@@ -23,8 +23,6 @@ static enum {
 } State;
 
 bool loggedIn;
-uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
-uint16_t ResponseByteCount;
 
 void EM4233AppInit(void) {
     State = STATE_READY;
diff --git a/Firmware/Chameleon-Mini/Application/ISO15693-A.c b/Firmware/Chameleon-Mini/Application/ISO15693-A.c
index f201153..9308d9e 100644
--- a/Firmware/Chameleon-Mini/Application/ISO15693-A.c
+++ b/Firmware/Chameleon-Mini/Application/ISO15693-A.c
@@ -3,7 +3,9 @@
 #include <util/crc16.h>
 
 CurrentFrame FrameInfo;
+uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
 uint8_t MyAFI;
+uint16_t ResponseByteCount;
 
 //Refer to ISO/IEC 15693-3:2001 page 41
 uint16_t calculateCRC(void *FrameBuf, uint16_t FrameBufSize) {
diff --git a/Firmware/Chameleon-Mini/Application/ISO15693-A.h b/Firmware/Chameleon-Mini/Application/ISO15693-A.h
index 71b9230..61d6701 100644
--- a/Firmware/Chameleon-Mini/Application/ISO15693-A.h
+++ b/Firmware/Chameleon-Mini/Application/ISO15693-A.h
@@ -86,7 +86,9 @@ typedef struct {
     bool Selected;
 } CurrentFrame;
 extern CurrentFrame FrameInfo;  /* Holds current frame information */
-extern uint8_t MyAFI;           /* Holds current tag's AFI (is used in inventory) */
+extern uint8_t Uid[];
+extern uint8_t MyAFI;           /* Holds current tag's AFI, used during inventory */
+extern uint16_t ResponseByteCount;  /* Length of response, used when building response frames */
 
 void ISO15693AppendCRC(uint8_t *FrameBuf, uint16_t FrameBufSize);
 bool ISO15693CheckCRC(void *FrameBuf, uint16_t FrameBufSize);
diff --git a/Firmware/Chameleon-Mini/Application/TITagitstandard.c b/Firmware/Chameleon-Mini/Application/TITagitstandard.c
index 101ee9b..b770b8b 100644
--- a/Firmware/Chameleon-Mini/Application/TITagitstandard.c
+++ b/Firmware/Chameleon-Mini/Application/TITagitstandard.c
@@ -18,8 +18,6 @@ static enum {
 
 uint16_t UserLockBits_Mask = 0;     /* Holds lock state of blocks */
 uint16_t FactoryLockBits_Mask = 0;  /* Holds lock state of blocks */
-uint8_t Uid[ISO15693_GENERIC_UID_SIZE];
-uint16_t ResponseByteCount;
 
 void TITagitstandardAppInit(void) {
     State = STATE_READY;
@@ -216,7 +214,7 @@ void TITagitstandardGetUid(ConfigurationUidType Uid) {
     TITagitstandardFlipUid(Uid);
 }
 
-void TITagitstandardSetUid(ConfigurationUidType Uid) {
+void TITagitstandardSetUid(ConfigurationUidType NewUid) {
     memcpy(Uid, NewUid, ActiveConfiguration.UidSize); // Update the local variable
     // Reverse UID before writing it
     TITagitstandardFlipUid(Uid);