Fix Transaction Executor wrappers