Further travis fixes.