Fix some TODOs