Fix extends check
Fix accept_quit