Even more Travis fixes.