timeout & delay reset fixes

(see commits)