HTC DNA related ion.h fixes