Fix defined DS in some cases
Temporarily disable auto-CS