Direct speech: Tom says, "We shall discuss this tomorrow."
Book answer: He said that we should discuss it tomorrow.
Direct speech: Tom shows me two bullets. Tom says, "I found these embedded in the paneling."
Book answer: He said that he found them embedded in the paneling.
I think in the former (example #1) there should be that instead of it, and in the latter (example #2) there should be those instead of them. Because these changed into those and this changed into that when we changed direct speech into indirect speech. Am I right?