Fixed broadcast listener issues and force quits