Fixing a few more TODOs.