Improvements in announcer and discoverypeer.