Improve tcdb locking bug repair bundle.