Updating a few low level TODOs

[skip ci]