Fix commits and todos.