Some more `saltenv` related changes/fixes