Maint/master/packaging fixups