Improve lobby event handling