some fixes revealed in hca