Fixes for multiple updates in one transaction