Improve gunicorn support