Solve some TODOs