Some updates for Travis-CI