More wsgi fixes