Improve Travis build