more fixes to timeout thread shutdown