couple fixes on env vars