Fixed transaction issues