Minor packaging changes