Some small fixes for Travis