Last batch of metric changes