Improve Travis support