Fix transaction handling in providers