Update AbstractMetric.java

Fixed two additional classes