diff --git a/src/lib/Convert.cpp b/src/lib/Convert.cpp
index 33a7742..5d0fc17 100644
--- a/src/lib/Convert.cpp
+++ b/src/lib/Convert.cpp
@@ -566,11 +566,11 @@ bool sttp::IsGuid(const string& value)
 Guid sttp::ParseGuid(const uint8_t* data, const bool swapEndianness)
 {
     Guid id;
+    uint8_t swappedBytes[16];
     uint8_t* encodedBytes;
 
     if (swapEndianness)
     {
-        uint8_t swappedBytes[16];
         uint8_t copy[8];
 
         for (uint32_t i = 0; i < 16; i++)
diff --git a/src/lib/transport/SubscriberConnection.cpp b/src/lib/transport/SubscriberConnection.cpp
index 4470cab..f0d6aea 100644
--- a/src/lib/transport/SubscriberConnection.cpp
+++ b/src/lib/transport/SubscriberConnection.cpp
@@ -1402,7 +1402,7 @@ SignalIndexCachePtr SubscriberConnection::ParseSubscriptionRequest(const string&
 	for (size_t i = 0; i < rows.size(); i++)
 	{
 		const DataRowPtr& row = rows[i];
-		const Guid& signalID = row->ValueAsGuid(signalIDColumn).GetValueOrDefault();
+		const Guid signalID = row->ValueAsGuid(signalIDColumn).GetValueOrDefault();
 		string source;
 		uint64_t id;