Minor tweaks and preparation in HKP backend