More trying to make rooms/channels work better.