Fix some packaging issue