diff --git a/image_analysis/image_preprocessing/ImagePreprocessorCPU.cpp b/image_analysis/image_preprocessing/ImagePreprocessorCPU.cpp
index 85247cbd6..8a24acb8a 100644
--- a/image_analysis/image_preprocessing/ImagePreprocessorCPU.cpp
+++ b/image_analysis/image_preprocessing/ImagePreprocessorCPU.cpp
@@ -69,7 +69,7 @@ void ImagePreprocessorCPU::AnalyzeBlock(ImagePreprocessorBuffer &processed_image
         const bool error = !masked & (v == err_pixel_val);
         const bool saturated = !masked & !error & (v >= sat_pixel_val);
         const U counted = static_cast<U>(-static_cast<int>(!masked & !error & !saturated));   // all bits, or none
-        out[i] = masked | error ? INT32_MIN : saturated ? INT32_MAX : static_cast<int32_t>(v);
+        out[i] = (masked | error) ? INT32_MIN : saturated ? INT32_MAX : static_cast<int32_t>(v);
         n_masked += masked;
         n_error += error;
         n_saturated += saturated;
diff --git a/reader/JFJochXFELReader.cpp b/reader/JFJochXFELReader.cpp
index fdc6d4e0d..4eee4f2a9 100644
--- a/reader/JFJochXFELReader.cpp
+++ b/reader/JFJochXFELReader.cpp
@@ -796,8 +796,8 @@ void JFJochXFELReader::MarkBad(const xfel::Mask &m, const T *v, size_t first, si
     const size_t last = first + n;   // the pixels [first, last) of the frame are those v holds
     for (int64_t ss = std::max<int64_t>(min_ss, first / frame_width_);
          ss <= max_ss && static_cast<size_t>(ss) * frame_width_ < last; ss++) {
-        const size_t begin = std::max(static_cast<size_t>(ss) * frame_width_ + min_fs, first);
-        const size_t end = std::min(static_cast<size_t>(ss) * frame_width_ + max_fs + 1, last);
+        const size_t begin = std::max<size_t>(static_cast<size_t>(ss) * frame_width_ + min_fs, first);
+        const size_t end = std::min<size_t>(static_cast<size_t>(ss) * frame_width_ + max_fs + 1, last);
         if (end <= begin)
             continue;
         const T *in = v + (begin - first);