Even more fixes for Travis