Fix build warnings
Fix the type on MetricsFilter singleton