Minor HCT fixes