Fixes for transactions