Fix issues with I-108565, I-108566, I-108563