Fix some display artifcats + add more compliance to HKP