Fixing more TODOs leftover from the 1.7 port