Two HC fixes