Trump, Congress agree on Harvey aid and short-term debt deal