r3399: a few more packaging fixes