Attempted Travis-related fixes.