[SQL] Some updates for Deepholm