[blivet] two minor patches