fixes more metric issues