Makes HKP backend more proper