Note a couple of bugs in the TODO.