TDBTool fixes