SNI should be working. Couple minor fixes/changes