fix backports from bootsalt