fix package kind issues