DoC auto HT check + buff fix