[skip ci] More env fixes