Small changes for a few leftover TODOs