Updates and bug fixes to txInternal timeout