Transaction fixes