Rework client pending key handling, fix insert/normal timers