US to address shortcomings in Iran deal: Mattis