Reflect MB's comments re warnings traceability