Added NplId in warnings, and severity grades.