Repack before transaction commit
More transactional fine-tuning