WebRelay fixes