diff --git a/source/build/include/fix16.h b/source/build/include/fix16.h
index eb532e49d..ea73b1cd9 100644
--- a/source/build/include/fix16.h
+++ b/source/build/include/fix16.h
@@ -92,7 +92,7 @@ static inline fix16_t fix16_abs(fix16_t x)
 static inline fix16_t fix16_floor(fix16_t x)
 	{ return (x & 0xFFFF0000UL); }
 static inline fix16_t fix16_ceil(fix16_t x)
-	{ return (x & 0xFFFF0000UL) + (x & 0x0000FFFFUL ? fix16_one : 0); }
+	{ return (x & 0xFFFF0000UL) + ((x & 0x0000FFFFUL) ? fix16_one : 0); }
 static inline fix16_t fix16_min(fix16_t x, fix16_t y)
 	{ return (x < y ? x : y); }
 static inline fix16_t fix16_max(fix16_t x, fix16_t y)
diff --git a/source/build/src/osd.cpp b/source/build/src/osd.cpp
index 273089d14..9526c02af 100644
--- a/source/build/src/osd.cpp
+++ b/source/build/src/osd.cpp
@@ -163,7 +163,7 @@ const char * OSD_StripColors(char *outBuf, const char *inBuf)
 int OSD_Exec(const char *szScript)
 {
     int err = 0;
-    int32_t handle, len;
+    int32_t handle, len = 0;
     char *buf = NULL;
 
     if ((handle = kopen4load(szScript, 0)) == -1)
diff --git a/source/build/src/pngwrite.cpp b/source/build/src/pngwrite.cpp
index 87b31342c..4f1d1f957 100644
--- a/source/build/src/pngwrite.cpp
+++ b/source/build/src/pngwrite.cpp
@@ -15,7 +15,7 @@ static FORCE_INLINE void png_write_uint32(uint32_t const in)
 static void png_write_chunk(uint32_t const size, char const *const type,
                             uint8_t const *const data, uint32_t flags)
 {
-    mz_ulong chunk_size = flags & CHUNK_COMPRESSED ? compressBound(size) : size;
+    mz_ulong chunk_size = (flags & CHUNK_COMPRESSED) ? compressBound(size) : size;
     uint8_t * const chunk = (uint8_t *) Xcalloc(1, 4 + chunk_size);
 
     Bmemcpy(chunk, type, 4);