metrix fixes