Fixes on transaction