Re-enable default site, fix listen args and issues related to 39c234ffb