Minor packaging fixes
v0.25