Fixed local env vars not overriding defaults