Fixed metrics errors