Fix $env and $const use