Some TODOs in 16.3
Minor correction in 17