HTC DNA related fixes