[blivet] various unrelated patches