Fix formatting and don't send an IP address in envelope (let server determine it)