fix issues in the setup process regarding initial tunnel config