More "is typing" fixes