Again, polishing stuff of the typing and polling threads