Added a couple of extra TODOs.