Minor changes to the todo-functions