Fixed several TODOs.