Fix deadlock that was occuring, and use a better Bonjour message.