hc related fixes