Bug fixes and auto join functionality