Slight changes to Bonjour code