diff --git a/packager/media/base/media_handler.h b/packager/media/base/media_handler.h
index 6ee664b845..9e5a4ed2bd 100644
--- a/packager/media/base/media_handler.h
+++ b/packager/media/base/media_handler.h
@@ -41,7 +41,7 @@ struct SegmentInfo {
 
 // TODO(kqyang): Should we use protobuf?
 struct StreamData {
-  size_t stream_index = -1;
+  size_t stream_index = static_cast<size_t>(-1);
   StreamDataType stream_data_type = StreamDataType::kUnknown;
 
   std::shared_ptr<PeriodInfo> period_info;
diff --git a/packager/media/chunking/chunking_handler.cc b/packager/media/chunking/chunking_handler.cc
index aafb184b90..34b682fe6d 100644
--- a/packager/media/chunking/chunking_handler.cc
+++ b/packager/media/chunking/chunking_handler.cc
@@ -128,7 +128,7 @@ Status ChunkingHandler::OnFlushRequest(size_t input_stream_index) {
         return status;
     }
   }
-  const int output_stream_index = input_stream_index;
+  const size_t output_stream_index = input_stream_index;
   return FlushDownstream(output_stream_index);
 }