Minor QETH related changes