Improve travis builds