adjust some TODOs for 5.10 and 5.18