More tweaking to try and suppress leave messages.