Fixed this week's TODOs