initial updates for metrics 3.0.1 (many pieces still disabled)