Fixing more Travis-related bugs.