Minor packaging updates