As always, #1 related. Additionally fixes servername bug