Small Fixes - cj transactions and misc.