Improve travis support?