Tended to some recently added TODOs