Packaging changes

pointed out by David Planella