Old HT fixes