Maint/stable/packaging fixes