Fixed initial service set up and advertising logic.