Solve some TODO's