Fix(?) environment variables