Fix leave messages perhaps