Working on HTC support issues