Updates from modwsgi env, fix issues