Address metric tool reported problems and adjust scores