[blivet] housekeeping patches