+ Fix transaction issues