Better auto-switching, and better global support