Fix ShangShi and DelayedTool