Changes for -listen-http