Cleanup, fix create vhost