Fix firstResponder issues