Improve travis build