Improve pending saves handling