Add some more default environment variables