DST bugfix + mysterious drag bugfix
Merge