finer grained commits and other db locking avoidance attempts