Fixed non-EDT threading.