ref #1725 [timing assertion failure]
[untracked] small fixes, corrections