Core Metrics fix