Some more Travis-CI adjustments....