Added a couple of TODOs.