Fix build warnings
Fix the type on MetricsFilter singleton
Merge branch 'fix-metrics-filter-type'