diff --git a/test/OWNERS b/test/OWNERS
index 777963e7c..fec9caaf6 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -1,4 +1,4 @@
 phoglund@webrtc.org
 kjellander@webrtc.org
 ivinnichenko@webrtc.org
-amyfong@webrtc.org
+
diff --git a/test/testsupport/metrics/video_metrics.cc b/test/testsupport/metrics/video_metrics.cc
index 1f55f6831..438f31b30 100644
--- a/test/testsupport/metrics/video_metrics.cc
+++ b/test/testsupport/metrics/video_metrics.cc
@@ -35,7 +35,7 @@ void CalculateFrame(VideoMetricsType video_metrics_type,
                     int height,
                     int frame_number,
                     QualityMetricsResult* result) {
-  FrameResult frame_result;
+  FrameResult frame_result = {0, 0};
   frame_result.frame_number = frame_number;
   switch (video_metrics_type) {
     case kPSNR:
@@ -64,11 +64,11 @@ void CalculateStats(QualityMetricsResult* result) {
   result->average = metrics_values_sum / result->frames.size();
 
   // Calculate min/max statistics
-  iter = min_element(result->frames.begin(), result->frames.end(),
+  iter = std::min_element(result->frames.begin(), result->frames.end(),
                      LessForFrameResultValue);
   result->min = iter->value;
   result->min_frame_number = iter->frame_number;
-  iter = max_element(result->frames.begin(), result->frames.end(),
+  iter = std::max_element(result->frames.begin(), result->frames.end(),
                      LessForFrameResultValue);
   result->max = iter->value;
   result->max_frame_number = iter->frame_number;