UnitOfWork cancelling support. Minor fixes.