Fixed a few trivial TODOs