Improved Tx locking