Fix env for cli and web