More tour setting tweaks