patches for envision

fix: clippy master


+21 -16
3 changed files