uwsgi fixes
merge