some fixes to make the lobby closer to working in strict mode