Various improvements for Travis