Fix env variable usage