Fixing some TODOs that needed to be cleaned up

More TODOs left over, but wanted to get as many pull requests through the system as possible to get code move into master as fast as possible.