diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.cc b/modules/audio_processing/aec3/adaptive_fir_filter.cc
index 8837c2cdfd..2b11125aee 100644
--- a/modules/audio_processing/aec3/adaptive_fir_filter.cc
+++ b/modules/audio_processing/aec3/adaptive_fir_filter.cc
@@ -298,8 +298,7 @@ void ApplyFilter_NEON(const RenderBuffer& render_buffer,
                       rtc::ArrayView<const FftData> H,
                       FftData* S) {
   RTC_DCHECK_GE(H.size(), H.size() - 1);
-  S->re.fill(0.f);
-  S->im.fill(0.f);
+  S->Clear();
 
   rtc::ArrayView<const FftData> render_buffer_data =
       render_buffer.GetFftBuffer();
diff --git a/modules/audio_processing/aec3/filter_analyzer.h b/modules/audio_processing/aec3/filter_analyzer.h
index f0f43264c7..0e1798ca09 100644
--- a/modules/audio_processing/aec3/filter_analyzer.h
+++ b/modules/audio_processing/aec3/filter_analyzer.h
@@ -50,7 +50,7 @@ class FilterAnalyzer {
   float Gain() const { return gain_; }
 
   // Returns the number of blocks for the current used filter.
-  float FilterLengthBlocks() const { return filter_length_blocks_; }
+  int FilterLengthBlocks() const { return filter_length_blocks_; }
 
   // Returns the preprocessed filter.
   rtc::ArrayView<const float> GetAdjustedFilter() const { return h_highpass_; }