diff --git a/src/stream_info_impl.cpp b/src/stream_info_impl.cpp
index 47ee2313..1feccb97 100644
--- a/src/stream_info_impl.cpp
+++ b/src/stream_info_impl.cpp
@@ -256,7 +256,7 @@ uint32_t lsl::stream_info_impl::calc_transport_buf_samples(
 	else if (nominal_srate() == LSL_IRREGULAR_RATE)
 		buf_samples = requested_len * 100;
 	else
-		buf_samples = nominal_srate() * requested_len;
+		buf_samples = static_cast<int32_t>(nominal_srate() * requested_len);
 	if (flags & transp_bufsize_thousandths) buf_samples /= 1000;
 	buf_samples = (buf_samples > 0) ? buf_samples : 1;
 	return buf_samples;
diff --git a/src/time_postprocessor.cpp b/src/time_postprocessor.cpp
index 98280129..16c54c02 100644
--- a/src/time_postprocessor.cpp
+++ b/src/time_postprocessor.cpp
@@ -4,8 +4,9 @@
 #include <limits>
 #include <utility>
 
+#if defined(__GNUC__)
 #pragma GCC diagnostic ignored "-Wdouble-promotion"
-#ifdef __clang__
+#elif defined(__clang__)
 #pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"
 #endif