[HK] Small tweaks during testing