diff --git a/include/icsneo/device/radpluto/radpluto.h b/include/icsneo/device/radpluto/radpluto.h
index 7c8bc97..7615182 100644
--- a/include/icsneo/device/radpluto/radpluto.h
+++ b/include/icsneo/device/radpluto/radpluto.h
@@ -44,6 +44,11 @@ protected:
 		encoder.supportCANFD = true;
 	}
 
+	virtual void setupDecoder(Decoder& decoder) override {
+		Device::setupDecoder(decoder);
+		decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
+	}
+
 	virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
 		for(auto& netid : GetSupportedNetworks())
 			rxNetworks.emplace_back(netid);
diff --git a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h
index d5bbd7d..73ace63 100644
--- a/include/icsneo/third-party/concurrentqueue/concurrentqueue.h
+++ b/include/icsneo/third-party/concurrentqueue/concurrentqueue.h
@@ -30,9 +30,11 @@
 
 #pragma once
 
+#ifdef _MSC_VER 
 #pragma warning(push)
 #pragma warning(disable:4127) // ICS: Warnings generated by this file
 #pragma warning(disable:4706)
+#endif 
 
 #if defined(__GNUC__)
 // Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
@@ -3638,4 +3640,6 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, ty
 #pragma GCC diagnostic pop
 #endif
 
-#pragma warning(pop)
\ No newline at end of file
+#if defined(_MSC_VAR)
+#pragma warning(pop)
+#endif
\ No newline at end of file