Adjusting some TODOs