diff --git a/src/st-trace/trace.c b/src/st-trace/trace.c
index 7b31900..549a1a3 100644
--- a/src/st-trace/trace.c
+++ b/src/st-trace/trace.c
@@ -410,7 +410,7 @@ static bool read_trace(stlink_t* stlink, st_trace_t* trace) {
 
 static void check_for_configuration_error(stlink_t* stlink, st_trace_t* trace, uint32_t trace_frequency) {
     // Only check configuration one time after the first 10 seconds of running.
-    uint32_t elapsed_time_s = time(NULL) - trace->start_time;
+    time_t elapsed_time_s = time(NULL) - trace->start_time;
     if (trace->configuration_checked || elapsed_time_s < 10) {
         return;
     }
diff --git a/src/stlink-lib/helper.c b/src/stlink-lib/helper.c
index 8b2c8e8..32d9b6c 100644
--- a/src/stlink-lib/helper.c
+++ b/src/stlink-lib/helper.c
@@ -11,5 +11,5 @@
 unsigned time_ms() {
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (unsigned)tv.tv_sec * 1000 + tv.tv_usec / 1000;
+    return (unsigned)(tv.tv_sec * 1000 + tv.tv_usec / 1000);
 }
diff --git a/src/stlink-lib/usb.c b/src/stlink-lib/usb.c
index ec0720a..caf31e2 100644
--- a/src/stlink-lib/usb.c
+++ b/src/stlink-lib/usb.c
@@ -1109,7 +1109,7 @@ int _stlink_usb_read_trace(stlink_t* sl, uint8_t* buf, size_t size) {
         return -1;
     }
 
-    size_t trace_count = read_uint16(sl->q_buf, 0);
+    uint16_t trace_count = read_uint16(sl->q_buf, 0);
 
     if (trace_count > size) {
         ELOG("read_trace insufficient buffer length\n");