Shield mitigation and xm use updates