Fix the todos given by Helge