Fixed Travis' TODO list