Fixed transaction scope issues;